Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/build-chimbuko-spack-dev-ddb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
8 changes: 5 additions & 3 deletions .github/workflows/build-chimbuko-spack-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
uses: actions/checkout@v5
with:
path: 'ChimbukoVisualizationII'
ref: 'actions'

- name: Check out the PerformanceAnalysis repo
uses: actions/checkout@v5
Expand Down Expand Up @@ -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
11 changes: 5 additions & 6 deletions .github/workflows/end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -47,5 +48,3 @@ jobs:
--volume $(pwd):$(pwd) \
chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \
-c "$(pwd)/docker/e2e-test.sh"


3 changes: 0 additions & 3 deletions docker/e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading