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..76f756b6a2 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -39,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 @@ -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: @@ -79,16 +73,16 @@ 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: | 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 +168,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..7cace146b8 100755 --- a/.github/workflows/download_test_data.sh +++ b/.github/workflows/download_test_data.sh @@ -13,11 +13,16 @@ BASE=`pwd` # based on root folder cd / +# 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 - 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_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 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