From e33c960acb990264032701f9723c903d8c5e8066 Mon Sep 17 00:00:00 2001 From: "Yngve S. Kristiansen" Date: Wed, 18 Oct 2023 08:59:49 +0200 Subject: [PATCH] Test downloads from docker --- .github/workflows/bundle_with_dakota.yml | 2 +- .github/workflows/test_repo_access.yml | 32 ++++++++++++++++++- .../build_wheels_gha.sh | 8 ++--- .../test_wheels_gha.sh | 2 +- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bundle_with_dakota.yml b/.github/workflows/bundle_with_dakota.yml index 714fefd4..149c1da3 100644 --- a/.github/workflows/bundle_with_dakota.yml +++ b/.github/workflows/bundle_with_dakota.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build_wheels: name: 🛞 Build Wheels 🛞 - timeout-minutes: 60 + timeout-minutes: 120 strategy: fail-fast: false matrix: diff --git a/.github/workflows/test_repo_access.yml b/.github/workflows/test_repo_access.yml index 4c1b6142..23585ca6 100644 --- a/.github/workflows/test_repo_access.yml +++ b/.github/workflows/test_repo_access.yml @@ -22,4 +22,34 @@ jobs: run: git clone https://${{ secrets.DEPENDENCY_ACCESS_TOKEN }}@github.com/equinor/spinningjenny.git - name: "DL Everest" - run: git clone https://${{ secrets.DEPENDENCY_ACCESS_TOKEN }}@github.com/equinor/everest.git \ No newline at end of file + run: git clone https://${{ secrets.DEPENDENCY_ACCESS_TOKEN }}@github.com/equinor/everest.git + + - name: "Clear CWD" + run: | + rm -rf everest + rm -rf seba + rm -rf spinningjenny + + - name: "DL Seba from docker" + uses: docker://quay.io/pypa/manylinux2014_x86_64 + env: + DEPENDENCY_ACCESS_TOKEN: ${{ secrets.DEPENDENCY_ACCESS_TOKEN }} + with: + entrypoint: /bin/bash + args: '-c "git clone https://$DEPENDENCY_ACCESS_TOKEN@github.com/TNO-Everest/seba.git"' + + - name: "DL spinningjenny from docker" + uses: docker://quay.io/pypa/manylinux2014_x86_64 + env: + DEPENDENCY_ACCESS_TOKEN: ${{ secrets.DEPENDENCY_ACCESS_TOKEN }} + with: + entrypoint: /bin/bash + args: '-c "git clone https://$DEPENDENCY_ACCESS_TOKEN@github.com/equinor/spinningjenny.git"' + + - name: "DL Everest from docker" + uses: docker://quay.io/pypa/manylinux2014_x86_64 + env: + DEPENDENCY_ACCESS_TOKEN: ${{ secrets.DEPENDENCY_ACCESS_TOKEN }} + with: + entrypoint: /bin/bash + args: '-c "git clone https://$DEPENDENCY_ACCESS_TOKEN@github.com/equinor/everest.git"' diff --git a/dakota_manylinux_install_files/build_wheels_gha.sh b/dakota_manylinux_install_files/build_wheels_gha.sh index edc3a47c..80e139aa 100644 --- a/dakota_manylinux_install_files/build_wheels_gha.sh +++ b/dakota_manylinux_install_files/build_wheels_gha.sh @@ -155,10 +155,6 @@ pip install pytest pytest tests # Should not give any errors pip wheel . -w wheelhouse &> $INSTALL_DIR/carolina_pipwheel.log -auditwheel repair wheelhouse/* -w dist &> $INSTALL_DIR/carolina_auditwheel_repair.log +auditwheel repair wheelhouse/* -w /github/workspace/dist &> $INSTALL_DIR/carolina_auditwheel_repair.log -# TODO Test that wheel works, and upload dist stuff to pypi -cp -r dist /github/workspace/dist -cp -r /github/workspace/trace - -echo "Copied distributables and installation trace" \ No newline at end of file +echo "Copied distributables and installation trace" diff --git a/dakota_manylinux_install_files/test_wheels_gha.sh b/dakota_manylinux_install_files/test_wheels_gha.sh index c31b25d4..cf38a0e4 100644 --- a/dakota_manylinux_install_files/test_wheels_gha.sh +++ b/dakota_manylinux_install_files/test_wheels_gha.sh @@ -42,4 +42,4 @@ pip install -e . pip install -r test_requirements.txt echo "Running everest tests..." -python -m pytest tests &> /github/workspace/trace/test_everest.log \ No newline at end of file +python -m pytest -n auto tests &> /github/workspace/trace/test_everest.log \ No newline at end of file