diff --git a/.github/workflows/build-chimbuko-spack-dev-ddb.yml b/.github/workflows/build-chimbuko-spack-dev-ddb.yml index 7c1cc95..92c1208 100644 --- a/.github/workflows/build-chimbuko-spack-dev-ddb.yml +++ b/.github/workflows/build-chimbuko-spack-dev-ddb.yml @@ -18,7 +18,6 @@ jobs: uses: actions/checkout@v5 with: path: 'ChimbukoVisualizationII' - ref: 'actions_unstable' - name: Check out the PerformanceAnalysis repo uses: actions/checkout@v5 @@ -44,9 +43,12 @@ jobs: - name: Pull chimbuko/chimbuko-spack-env docker image shell: bash run: | - docker pull ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-env:ubuntu18.04 + export OWNER_LOWER="$(\ + echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]'\ + )" + docker pull ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-env:ubuntu18.04 docker image tag \ - ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-env:ubuntu18.04 \ + ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-env:ubuntu18.04 \ chimbuko/chimbuko-spack-env:ubuntu18.04 - name: Build test environment image @@ -61,6 +63,9 @@ jobs: - name: Push chimbuko-spack-dev-ddb image shell: bash run: | + export OWNER_LOWER="$(\ + echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]'\ + )" docker image tag chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \ - ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 - docker image push ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 + ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 + docker image push ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 diff --git a/.github/workflows/build-chimbuko-spack-env.yml b/.github/workflows/build-chimbuko-spack-env.yml index 94e5f56..86683ef 100644 --- a/.github/workflows/build-chimbuko-spack-env.yml +++ b/.github/workflows/build-chimbuko-spack-env.yml @@ -18,7 +18,6 @@ jobs: uses: actions/checkout@v5 with: path: 'ChimbukoVisualizationII' - ref: 'actions' - name: Check out the PerformanceAnalysis repo uses: actions/checkout@v5 @@ -53,6 +52,9 @@ jobs: - name: Push PerformanceAnalysis image shell: bash run: | + export OWNER_LOWER="$(\ + echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]'\ + )" docker image tag chimbuko/chimbuko-spack-env:ubuntu18.04 \ - ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-env:ubuntu18.04 - docker image push ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-env:ubuntu18.04 + ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-env:ubuntu18.04 + docker image push ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-env:ubuntu18.04 diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index 000c5e8..f0d232c 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -17,8 +17,6 @@ jobs: # Check out ChimubkoVisualizationII (CV2) repo. - name: Check out the CV2 repo uses: actions/checkout@v4 - with: - ref: 'actions_unstable' - name: Check out the PerformanceAnalysis repo uses: actions/checkout@v4 @@ -30,9 +28,12 @@ jobs: - name: Pull chimbuko/chimbuko-spack-dev-ddb docker image shell: bash run: | - docker pull ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 + export OWNER_LOWER="$(\ + echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]'\ + )" + docker pull ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 docker image tag \ - ghcr.io/${{ github.repository_owner }}/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \ + ghcr.io/$OWNER_LOWER/chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \ chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 - name: Run tests in container @@ -47,5 +48,3 @@ jobs: --volume $(pwd):$(pwd) \ chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \ -c "$(pwd)/docker/e2e-test.sh" - - diff --git a/docker/e2e-test.sh b/docker/e2e-test.sh index 5adfbf6..739bc72 100755 --- a/docker/e2e-test.sh +++ b/docker/e2e-test.sh @@ -4,11 +4,8 @@ set -eux pipefail env -ls -halF $RUN_DIR - pushd $RUN_DIR git config --global --add safe.directory $RUN_DIR -git checkout actions_unstable mkdir -p data/grid ln -s /Downloads/repeat_1rank data/grid/