From 37873effb4bafc6ef73f057e185765598ddc031f Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 11:44:16 -0600 Subject: [PATCH 1/6] Try builds without remote host cache. --- .github/workflows/build-linux-debug.yml | 15 --------------- .github/workflows/build-linux.yml | 19 ------------------- .github/workflows/build-mac-arm64.yml | 18 ------------------ .github/workflows/build-mac.yml | 19 ------------------- .github/workflows/build-windows.yml | 15 --------------- .github/workflows/download_test_data.sh | 3 ++- .github/workflows/gha_deps.sh | 6 ------ 7 files changed, 2 insertions(+), 93 deletions(-) diff --git a/.github/workflows/build-linux-debug.yml b/.github/workflows/build-linux-debug.yml index a136b9d935..c87a2d1f99 100644 --- a/.github/workflows/build-linux-debug.yml +++ b/.github/workflows/build-linux-debug.yml @@ -28,12 +28,6 @@ jobs: steps: - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2.7.0 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - name: Conda info run: conda info @@ -60,10 +54,6 @@ jobs: - name: Get tags run: git fetch --unshallow origin +refs/tags/*:refs/tags/* - - name: Restore Caches - shell: bash -l {0} - run: .github/workflows/restore_caches.sh - - name: Check space3 run: df -h @@ -106,9 +96,4 @@ jobs: - name: make test shell: bash -l {0} run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV - - - name: Store ccache - shell: bash -l {0} - run: .github/workflows/store_ccache.sh - diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 131cec40f4..bc876fe6a7 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -29,12 +29,6 @@ jobs: steps: - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2.7.0 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - name: Conda info run: conda info @@ -61,10 +55,6 @@ jobs: - name: Check space3 run: df -h - - name: Restore Caches - shell: bash -l {0} - run: .github/workflows/restore_caches.sh - - name: Conda Installs shell: bash -l {0} run: .github/workflows/gha_conda.sh @@ -115,10 +105,6 @@ jobs: shell: bash -l {0} run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV - - name: Copy artifact - shell: bash -l {0} - run: cd /__w/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-linux * - - uses: actions/upload-artifact@v2 with: name: artifact-${{github.sha}}-linux @@ -135,9 +121,4 @@ jobs: title: "Development Build for Linux" files: | ${{runner.workspace}}/ShapeWorks/artifacts/*.tar.gz - - - name: Store ccache - shell: bash -l {0} - run: .github/workflows/store_ccache.sh - diff --git a/.github/workflows/build-mac-arm64.yml b/.github/workflows/build-mac-arm64.yml index 2c2d228175..9915a62333 100644 --- a/.github/workflows/build-mac-arm64.yml +++ b/.github/workflows/build-mac-arm64.yml @@ -28,12 +28,6 @@ jobs: steps: - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - name: Setup Miniconda uses: conda-incubator/setup-miniconda@v3.0.4 @@ -52,10 +46,6 @@ jobs: - name: Get tags run: git fetch --unshallow origin +refs/tags/*:refs/tags/* - - name: Restore Caches - shell: bash -l {0} - run: .github/workflows/restore_caches.sh - - name: Conda Installs shell: bash -l {0} run: .github/workflows/gha_conda.sh @@ -115,12 +105,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Store ccache - shell: bash -l {0} - run: .github/workflows/store_ccache.sh - - - name: Copy artifact - shell: bash -l {0} - run: cd ${{runner.workspace}}/ShapeWorks && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-mac-arm64 artifacts diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index 77984c6d80..1eacbce050 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -28,12 +28,6 @@ jobs: steps: - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - name: OS Setup run: | ls /usr/local @@ -57,10 +51,6 @@ jobs: - name: Get tags run: git fetch --unshallow origin +refs/tags/*:refs/tags/* - - name: Restore Caches - shell: bash -l {0} - run: .github/workflows/restore_caches.sh - - name: Conda Installs shell: bash -l {0} run: .github/workflows/gha_conda.sh @@ -120,12 +110,3 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Store ccache - shell: bash -l {0} - run: .github/workflows/store_ccache.sh - - - name: Copy artifact - shell: bash -l {0} - run: cd ${{runner.workspace}}/ShapeWorks && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-mac artifacts - diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index e514264099..095925cd1c 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -65,12 +65,6 @@ jobs: # with: # miniconda-version: 'latest' - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - name: Checkout code uses: actions/checkout@v3 with: @@ -85,10 +79,6 @@ jobs: curl -o nsis.zip http://www.sci.utah.edu/~amorris/NSISPortable_3.04.zip Expand-Archive -LiteralPath nsis.zip -DestinationPath . - - name: Restore Caches - shell: bash -l {0} - run: .github/workflows/restore_caches.sh - - name: Conda Installs shell: bash -l {0} run: .github/workflows/gha_conda.sh @@ -174,8 +164,3 @@ jobs: title: "Development Build for Windows" files: | d:/a/ShapeWorks/ShapeWorks/artifacts/*.exe - - - name: Copy artifact - shell: bash -l {0} - run: cd /d/a/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-windows * - diff --git a/.github/workflows/download_test_data.sh b/.github/workflows/download_test_data.sh index 6be6385839..c578700b78 100755 --- a/.github/workflows/download_test_data.sh +++ b/.github/workflows/download_test_data.sh @@ -17,7 +17,8 @@ cd / # Tiny test data downloads for run in {1..5}; do if [ ! -f /tmp/tiny_test_cache.tar.gz ] ; then - scp runner@${CACHE_HOST}:github/tiny_test_cache.tar.gz /tmp || true + cd /tmp + wget https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true sleep 1 fi done diff --git a/.github/workflows/gha_deps.sh b/.github/workflows/gha_deps.sh index d11b4fd0e6..1a27729b7f 100755 --- a/.github/workflows/gha_deps.sh +++ b/.github/workflows/gha_deps.sh @@ -38,10 +38,4 @@ else ./build_dependencies.sh --build-type=$BUILD_TYPE --num-procs=$NPROCS --clean-after rm -rf $BUILD_DIR - - echo "Create and store cache" - cd / - compress_file ${FILE} "${DEP_PATH}" - scp ${FILE} runner@${CACHE_HOST}:github - rm ${FILE} fi From c3390d8240cc0d84a4fefb53aa66602cac74f173 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 12:38:59 -0600 Subject: [PATCH 2/6] Fix conda cache step --- .github/workflows/gha_conda.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/gha_conda.sh b/.github/workflows/gha_conda.sh index 0815e0a014..a867c0e7cd 100755 --- a/.github/workflows/gha_conda.sh +++ b/.github/workflows/gha_conda.sh @@ -15,12 +15,6 @@ else # run install source ./install_shapeworks.sh --developer conda clean -p -t -y - - echo "Create and store cache" - cd / - compress_file /tmp/${CONDA_FILE} "${CONDA_PATH}" - scp /tmp/${CONDA_FILE} runner@${CACHE_HOST}:github - rm /tmp/${CONDA_FILE} fi conda init bash From 38247e0189515eeade2a2ff4f042c043fd5ce43e Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 15:01:56 -0600 Subject: [PATCH 3/6] Try msys wget for windows --- .github/workflows/download_test_data.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/download_test_data.sh b/.github/workflows/download_test_data.sh index c578700b78..a3d4962e21 100755 --- a/.github/workflows/download_test_data.sh +++ b/.github/workflows/download_test_data.sh @@ -13,12 +13,19 @@ BASE=`pwd` # based on root folder cd / +WGET="wget" + +# if windows +if [ -f /usr/bin/wget ]; then + WGET="C:\msys64\usr\bin\wget.exe" +fi + # Tiny test data downloads for run in {1..5}; do if [ ! -f /tmp/tiny_test_cache.tar.gz ] ; then cd /tmp - wget https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true + $WGET https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true sleep 1 fi done From a07e09486ba8a17b32b70472da35912e3fd94506 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 17:09:01 -0600 Subject: [PATCH 4/6] Try choco install wget --- .github/workflows/build-windows.yml | 4 ++++ .github/workflows/download_test_data.sh | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 095925cd1c..0c0702097a 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -28,6 +28,10 @@ jobs: steps: + - name: Download test data + shell: bash -l {0} + run: .github/workflows/download_test_data.sh + - name: Add to path shell: bash -l {0} run: echo "C:\Miniconda\condabin" >> $GITHUB_PATH diff --git a/.github/workflows/download_test_data.sh b/.github/workflows/download_test_data.sh index a3d4962e21..f0996a96fe 100755 --- a/.github/workflows/download_test_data.sh +++ b/.github/workflows/download_test_data.sh @@ -13,11 +13,9 @@ BASE=`pwd` # based on root folder cd / -WGET="wget" - # if windows if [ -f /usr/bin/wget ]; then - WGET="C:\msys64\usr\bin\wget.exe" + choco install wget --no-progress fi @@ -25,7 +23,7 @@ fi for run in {1..5}; do if [ ! -f /tmp/tiny_test_cache.tar.gz ] ; then cd /tmp - $WGET https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true + wget https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true sleep 1 fi done From c1a0b7d8bcc05142c71ec15e2155b874468f4ec6 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 17:10:25 -0600 Subject: [PATCH 5/6] Fix platform check --- .github/workflows/download_test_data.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/download_test_data.sh b/.github/workflows/download_test_data.sh index f0996a96fe..7cace146b8 100755 --- a/.github/workflows/download_test_data.sh +++ b/.github/workflows/download_test_data.sh @@ -13,12 +13,11 @@ BASE=`pwd` # based on root folder cd / -# if windows -if [ -f /usr/bin/wget ]; then +# if platform is windows, install wget +if [ "$PLATFORM" == "windows" ]; then choco install wget --no-progress fi - # Tiny test data downloads for run in {1..5}; do if [ ! -f /tmp/tiny_test_cache.tar.gz ] ; then From 913ea2670304d4b8e27616b668cf2b18ba41b0c7 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Tue, 18 Jun 2024 17:11:55 -0600 Subject: [PATCH 6/6] Fix step --- .github/workflows/build-windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 0c0702097a..76f756b6a2 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -28,10 +28,6 @@ jobs: steps: - - name: Download test data - shell: bash -l {0} - run: .github/workflows/download_test_data.sh - - name: Add to path shell: bash -l {0} run: echo "C:\Miniconda\condabin" >> $GITHUB_PATH @@ -43,7 +39,7 @@ jobs: - name: Init conda shell: bash -l {0} run: /c/Miniconda/condabin/conda.bat init --all - + # - name: link # shell: bash -l {0} # run: cd /usr/bin && ln -s /c/Miniconda/condabin/conda.bat conda @@ -77,6 +73,10 @@ jobs: - name: Get tags run: git fetch --unshallow origin +refs/tags/*:refs/tags/* + - name: Download test data + shell: bash -l {0} + run: .github/workflows/download_test_data.sh + - name: Get NSIS working-directory: ${{runner.workspace}} run: |