From 85132874c64da66d1d5369dcedec2f3e85b0eca2 Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Tue, 19 Jan 2021 00:17:55 -0500 Subject: [PATCH] Travis names replaced to generic CI Signed-off-by: Gines Hidalgo --- .github/CI_deprecated/.travis.yml | 10 +++--- .github/workflows/main.yml | 52 +++++++++++++++---------------- doc/contributors.md | 1 + scripts/CI/configure.sh | 0 scripts/CI/configure_cmake.sh | 6 ++-- scripts/CI/configure_make.sh | 0 scripts/CI/defaults.sh | 4 +-- scripts/CI/install_deps_osx.sh | 0 scripts/CI/install_deps_ubuntu.sh | 2 +- scripts/CI/run_make.sh | 8 ++--- scripts/CI/run_tests.sh | 2 +- scripts/generate_gh_pages.sh | 12 +++---- 12 files changed, 49 insertions(+), 48 deletions(-) mode change 100644 => 100755 scripts/CI/configure.sh mode change 100644 => 100755 scripts/CI/configure_cmake.sh mode change 100644 => 100755 scripts/CI/configure_make.sh mode change 100644 => 100755 scripts/CI/defaults.sh mode change 100644 => 100755 scripts/CI/install_deps_osx.sh mode change 100644 => 100755 scripts/CI/install_deps_ubuntu.sh mode change 100644 => 100755 scripts/CI/run_make.sh mode change 100644 => 100755 scripts/CI/run_tests.sh diff --git a/.github/CI_deprecated/.travis.yml b/.github/CI_deprecated/.travis.yml index b2ec7d2b..422b8964 100644 --- a/.github/CI_deprecated/.travis.yml +++ b/.github/CI_deprecated/.travis.yml @@ -8,7 +8,7 @@ # # Environment variables + OS + other parameters # global: # - GH_REPO_NAME: openpose -# - DOXYFILE: $TRAVIS_BUILD_DIR/scripts/doc_autogeneration.doxygen +# - DOXYFILE: $CI_BUILD_DIR/scripts/doc_autogeneration.doxygen # # Set this in Environment Variables on travis-ci.org # # - GH_REPO_REF: github.com//openpose.git # matrix: @@ -34,7 +34,7 @@ # sudo: required # # Generate and deploy documentation # after_success: -# - cd $TRAVIS_BUILD_DIR +# - cd $CI_BUILD_DIR # - chmod +x scripts/generate_gh_pages.sh # - ./scripts/generate_gh_pages.sh # # Ubuntu 16.04 - Python - CMake - CPU @@ -148,9 +148,9 @@ # # Install Caffe and OP dependencies # install: -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash scripts/CI/install_deps_ubuntu.sh ; fi -# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/CI/install_deps_osx.sh ; fi -# - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then exit 99 ; fi +# - if [[ "$CI_OS_NAME" == "linux" ]]; then sudo bash scripts/CI/install_deps_ubuntu.sh ; fi +# - if [[ "$CI_OS_NAME" == "osx" ]]; then bash scripts/CI/install_deps_osx.sh ; fi +# - if [[ "$CI_OS_NAME" == "windows" ]]; then exit 99 ; fi # # Running CMake # before_script: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25594ae3..bb1138de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,14 +23,14 @@ jobs: env: NAME: U20-default-cmake-cuda WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 18.04 - Default - CMake - CUDA - os: ubuntu-18.04 os_name: linux env: NAME: U18-default-cmake-cuda WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 20.04 - Python - CMake - CUDA - os: ubuntu-20.04 os_name: linux @@ -38,9 +38,9 @@ jobs: NAME: U20-python-cmake-cuda WITH_CUDNN: false WITH_PYTHON: true - TRAVIS_OS_NAME: linux - TRAVIS_BUILD_NUMBER: ${{ github.run_number }} - TRAVIS_COMMIT: ${{ github.sha }} + CI_OS_NAME: linux + CI_BUILD_NUMBER: ${{ github.run_number }} + CI_COMMIT: ${{ github.sha }} PYTHON3_VERSION: python3.8 DOCS: true # Ubuntu 18.04 - Python - CMake - CUDA @@ -50,9 +50,9 @@ jobs: NAME: U18-python-cmake-cuda WITH_CUDNN: false WITH_PYTHON: true - TRAVIS_OS_NAME: linux - TRAVIS_BUILD_NUMBER: ${{ github.run_number }} - TRAVIS_COMMIT: ${{ github.sha }} + CI_OS_NAME: linux + CI_BUILD_NUMBER: ${{ github.run_number }} + CI_COMMIT: ${{ github.sha }} DOCS: true # Ubuntu 20.04 - Python - CMake - CPU - os: ubuntu-20.04 @@ -62,7 +62,7 @@ jobs: WITH_PYTHON: true WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux PYTHON3_VERSION: python3.8 # Ubuntu 18.04 - Python - CMake - CPU - os: ubuntu-18.04 @@ -72,7 +72,7 @@ jobs: WITH_PYTHON: true WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 16.04 - Python - CMake - CPU - os: ubuntu-16.04 os_name: linux @@ -81,7 +81,7 @@ jobs: WITH_PYTHON: true WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # TO-DO (not passing) # # Ubuntu 20.04 - Python - CMake - OpenCL # - os: ubuntu-20.04 @@ -92,7 +92,7 @@ jobs: # WITH_CUDA: false # WITH_CUDNN: false # WITH_OPEN_CL: true - # TRAVIS_OS_NAME: linux + # CI_OS_NAME: linux # PYTHON3_VERSION: python3.8 # Ubuntu 18.04 - Python - CMake - OpenCL - os: ubuntu-18.04 @@ -103,7 +103,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_OPEN_CL: true - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 16.04 - Python - CMake - OpenCL - os: ubuntu-16.04 os_name: linux @@ -113,7 +113,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_OPEN_CL: true - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 20.04 - Python - CMake - CPU - Debug - os: ubuntu-20.04 os_name: linux @@ -123,7 +123,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_DEBUG: true - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux PYTHON3_VERSION: python3.8 # Ubuntu 18.04 - Python - CMake - CPU - Debug - os: ubuntu-18.04 @@ -134,7 +134,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_DEBUG: true - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 16.04 - Python - CMake - CPU - Debug - os: ubuntu-16.04 os_name: linux @@ -144,7 +144,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_DEBUG: true - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Ubuntu 20.04 - Python - CMake - CPU - Unity - os: ubuntu-20.04 os_name: linux @@ -154,7 +154,7 @@ jobs: WITH_UNITY: true WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux PYTHON3_VERSION: python3.8 # Ubuntu 20.04 - Default - CMake - CPU - os: ubuntu-20.04 @@ -163,7 +163,7 @@ jobs: NAME: U20-default-cmake-cpu WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: linux + CI_OS_NAME: linux # Mac OSX # Mac OSX - Python - CMake - CPU @@ -174,7 +174,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_PYTHON: true - TRAVIS_OS_NAME: osx + CI_OS_NAME: osx # Mac OSX - Python - CMake - OpenCL - os: macos-10.15 os_name: osx @@ -183,7 +183,7 @@ jobs: WITH_CUDA: false WITH_CUDNN: false WITH_OPEN_CL: true - TRAVIS_OS_NAME: osx + CI_OS_NAME: osx # Mac OSX - Python - CMake - CPU - Debug - os: macos-10.15 os_name: osx @@ -193,7 +193,7 @@ jobs: WITH_CUDNN: false WITH_PYTHON: true WITH_DEBUG: true - TRAVIS_OS_NAME: osx + CI_OS_NAME: osx # Mac OSX - Python - CMake - CPU - Unity - os: macos-10.15 os_name: osx @@ -203,7 +203,7 @@ jobs: WITH_CUDNN: false WITH_PYTHON: true WITH_UNITY: true - TRAVIS_OS_NAME: osx + CI_OS_NAME: osx # Mac OSX - Default - CMake - CPU - os: macos-10.15 os_name: osx @@ -211,7 +211,7 @@ jobs: NAME: OSX-default-cmake-cpu WITH_CUDA: false WITH_CUDNN: false - TRAVIS_OS_NAME: osx + CI_OS_NAME: osx # TO-DO (not passing) # Note: CUDA jobs fail in U16 because of an issue with GCC 5.5 (https://github.com/NVIDIA/apex/issues/529). GH Actions doesn't support @@ -222,7 +222,7 @@ jobs: # os_name: linux # env: # NAME: U16-default-cmake-cuda8 - # TRAVIS_OS_NAME: linux + # CI_OS_NAME: linux # # Deprecated (not working for the above issue between CUDA and the Ubuntu16 from GitHub Actions) # # Ubuntu 16.04 - Default - Make - CUDA @@ -232,7 +232,7 @@ jobs: # NAME: U16-default-make-cuda # WITH_CUDNN: false # WITH_CMAKE: false - # TRAVIS_OS_NAME: linux + # CI_OS_NAME: linux steps: - uses: actions/checkout@v2 diff --git a/doc/contributors.md b/doc/contributors.md index b46fe33b..5fde3f28 100644 --- a/doc/contributors.md +++ b/doc/contributors.md @@ -19,3 +19,4 @@ We would also like to thank the following people who have highly contributed to 4. [Luis Fernando Fraga](https://github.com/fragalfernando): Implementation of Lukas-Kanade algorith and person ID extractor. 5. [Akash Patwal](https://www.linkedin.com/in/akash-patwal-63a12012a): Speedup of the CUDA image resize and visual skeleton rendering, as well as extension that allows OpenPose to speedup linearly to more than 4 GPUs. 6. [Helen Medina](https://github.com/helen-medina): Initial Windows version. +7. [Matthijs van der Burgh](https://github.com/MatthijsBurgh): Initial GitHub Actions CI version for Ubuntu and Mac, and ported all the deprecated Travis CI tests into the new CI system. diff --git a/scripts/CI/configure.sh b/scripts/CI/configure.sh old mode 100644 new mode 100755 diff --git a/scripts/CI/configure_cmake.sh b/scripts/CI/configure_cmake.sh old mode 100644 new mode 100755 index 261ccb05..f4d675c8 --- a/scripts/CI/configure_cmake.sh +++ b/scripts/CI/configure_cmake.sh @@ -13,7 +13,7 @@ fi echo "WITH_PYTHON = ${WITH_PYTHON}." if [[ $WITH_PYTHON == true ]] ; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then + if [[ "$CI_OS_NAME" == "linux" ]] ; then ARGS="$ARGS -DBUILD_PYTHON=On" if [[ $PYTHON3_VERSION ]] ; then ARGS="$ARGS -DPYTHON_EXECUTABLE=/usr/bin/${PYTHON3_VERSION} -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/lib${PYTHON3_VERSION}m.so" @@ -22,7 +22,7 @@ if [[ $WITH_PYTHON == true ]] ; then ARGS="$ARGS -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7m.so" fi fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then + if [[ "$CI_OS_NAME" == "osx" ]] ; then ARGS="$ARGS -DBUILD_PYTHON=On -DPYTHON_EXECUTABLE=/usr/local/bin/python2.7 -DPYTHON_LIBRARY=/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7m.dylib" fi echo "Python arguments = $ARGS" @@ -71,7 +71,7 @@ echo "ARGS = ${ARGS}." cmake .. $ARGS # Patch for OpenCL and OSX -if [[ $WITH_OPEN_CL == true && $TRAVIS_OS_NAME == "osx" ]] ; then +if [[ $WITH_OPEN_CL == true && $CI_OS_NAME == "osx" ]] ; then cd ../3rdparty/caffe; git apply ../../scripts/osx/mac_opencl_patch.txt; cd ../../build; fi diff --git a/scripts/CI/configure_make.sh b/scripts/CI/configure_make.sh old mode 100644 new mode 100755 diff --git a/scripts/CI/defaults.sh b/scripts/CI/defaults.sh old mode 100644 new mode 100755 index 4d0e8534..e61ed268 --- a/scripts/CI/defaults.sh +++ b/scripts/CI/defaults.sh @@ -2,7 +2,7 @@ # Set default environment variables set -e -TRAVIS_OS_NAME=${TRAVIS_OS_NAME} +CI_OS_NAME=${CI_OS_NAME} WITH_CMAKE=${WITH_CMAKE:-true} WITH_PYTHON=${WITH_PYTHON:-false} WITH_CUDA=${WITH_CUDA:-true} @@ -18,7 +18,7 @@ then WITH_CUDNN=false fi -# Examples should be run (Travis not compatible with GPU code) +# Examples should be run (CI environment not compatible with GPU code) # if [[ $WITH_CMAKE == true ]] && [[ $WITH_PYTHON == true ]] && [[ $WITH_CUDA == false ]] && [[ $WITH_OPEN_CL == false ]] && [[ $WITH_MKL == false ]]; then if [[ $WITH_CUDA == false ]] && [[ $WITH_OPEN_CL == false ]] && [[ $WITH_UNITY == false ]]; then RUN_EXAMPLES=true diff --git a/scripts/CI/install_deps_osx.sh b/scripts/CI/install_deps_osx.sh old mode 100644 new mode 100755 diff --git a/scripts/CI/install_deps_ubuntu.sh b/scripts/CI/install_deps_ubuntu.sh old mode 100644 new mode 100755 index a0a0192f..e10568ee --- a/scripts/CI/install_deps_ubuntu.sh +++ b/scripts/CI/install_deps_ubuntu.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install dependencies for Ubuntu -echo "Running on ${TRAVIS_OS_NAME} OS." +echo "Running on ${CI_OS_NAME} OS." BASEDIR=$(dirname $0) source $BASEDIR/defaults.sh diff --git a/scripts/CI/run_make.sh b/scripts/CI/run_make.sh old mode 100644 new mode 100755 index 0233ea79..ac855400 --- a/scripts/CI/run_make.sh +++ b/scripts/CI/run_make.sh @@ -7,9 +7,9 @@ source $BASEDIR/defaults.sh if [[ $WITH_CMAKE == true ]] ; then cd build - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make -j`nproc` ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make -j`sysctl -n hw.logicalcpu` ; fi + if [[ "$CI_OS_NAME" == "linux" ]]; then make -j`nproc` ; fi + if [[ "$CI_OS_NAME" == "osx" ]]; then make -j`sysctl -n hw.logicalcpu` ; fi else - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make all -j`nproc` ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make all -j`sysctl -n hw.logicalcpu` ; fi + if [[ "$CI_OS_NAME" == "linux" ]]; then make all -j`nproc` ; fi + if [[ "$CI_OS_NAME" == "osx" ]]; then make all -j`sysctl -n hw.logicalcpu` ; fi fi diff --git a/scripts/CI/run_tests.sh b/scripts/CI/run_tests.sh old mode 100644 new mode 100755 index 6d1274b4..9dc05499 --- a/scripts/CI/run_tests.sh +++ b/scripts/CI/run_tests.sh @@ -107,7 +107,7 @@ if [[ $RUN_EXAMPLES == true ]] ; then echo "Demos and tutorials successfully finished!" -# Disable examples for all other Travis Build configurations +# Disable examples for all other CI Build configurations else echo "Skipping tests for non CPU-only versions." exit 0 diff --git a/scripts/generate_gh_pages.sh b/scripts/generate_gh_pages.sh index b8799da1..4436dbdb 100755 --- a/scripts/generate_gh_pages.sh +++ b/scripts/generate_gh_pages.sh @@ -8,13 +8,13 @@ __AUTHOR__="openpose" # - Packages doxygen doxygen-doc doxygen-latex doxygen-gui graphviz # must be installed. # - Doxygen configuration file must have the destination directory empty and -# source code directory with a $(TRAVIS_BUILD_DIR) prefix. +# source code directory with a $(CI_BUILD_DIR) prefix. # - An gh-pages branch should already exist. See below for mor info on hoe to # create a gh-pages branch. # # Required global variables: -# - TRAVIS_BUILD_NUMBER : The number of the current build. -# - TRAVIS_COMMIT : The commit that the current build is testing. +# - CI_BUILD_NUMBER : The number of the current build. +# - CI_COMMIT : The commit that the current build is testing. # - DOXYFILE : The Doxygen configuration file. # - GH_REPO_NAME : The name of the repository. # - GH_REPO_REF : The GitHub reference to the repository. @@ -71,8 +71,8 @@ echo "" > .nojekyll ##### Generate the Doxygen code documentation and log the output. ##### echo 'Generating Doxygen code documentation...' # Redirect both stderr and stdout to the log file AND the console. -echo "INPUT = ${TRAVIS_BUILD_DIR}/README.md ${TRAVIS_BUILD_DIR}/include/openpose/" >> $DOXYFILE -echo "USE_MDFILE_AS_MAINPAGE = ${TRAVIS_BUILD_DIR}/README.md" >> $DOXYFILE +echo "INPUT = ${CI_BUILD_DIR}/README.md ${CI_BUILD_DIR}/include/openpose/" >> $DOXYFILE +echo "USE_MDFILE_AS_MAINPAGE = ${CI_BUILD_DIR}/README.md" >> $DOXYFILE echo "OUTPUT_DIRECTORY = " >> $DOXYFILE doxygen $DOXYFILE 2>&1 | tee doxygen.log @@ -92,7 +92,7 @@ if [ -d "html" ] && [ -f "html/index.html" ]; then # Commit the added files with a title and description containing the Travis CI # build number and the GitHub commit reference that issued this build. - git commit -m "Deploy code docs to GitHub Pages Travis build: ${TRAVIS_BUILD_NUMBER}" -m "Commit: ${TRAVIS_COMMIT}" + git commit -m "Deploy code docs to GitHub Pages Travis build: ${CI_BUILD_NUMBER}" -m "Commit: ${CI_COMMIT}" # Force push to the remote gh-pages branch. # The ouput is redirected to /dev/null to hide any sensitive credential data -- GitLab