Skip to content

Commit 1f2c981

Browse files
committed
misc: Tweak until it works
1 parent c7e7aa0 commit 1f2c981

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/actions/docker-clean/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ runs:
1616
steps:
1717
- id: dockerclean
1818
name: "Cleanup docker image"
19+
shell: bash
1920
run: |
2021
docker image rm -f "${{ inputs.tag }}_${{ inputs.id }}"

.github/actions/docker-run/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ author: "Devito"
44

55
inputs:
66
# The only supported GHA input type is string
7-
id:
7+
uid:
88
description: "Unique identifier output from docker-build action"
99
required: true
1010
args:
@@ -49,7 +49,7 @@ runs:
4949
docker run \
5050
--init -t --rm \
5151
${{ inputs.args }} \
52-
--name "ci-${{ inputs.name }}-${{ inputs.id }}" \
52+
--name "ci-${{ inputs.name }}-${{ inputs.uid }}" \
5353
${{ steps.processenv.outputs.env }} \
54-
"${{ inputs.tag }}_${{ inputs.id }}" \
54+
"${{ inputs.tag }}_${{ inputs.uid }}" \
5555
${{ inputs.command }}

.github/workflows/pytest-core-mpi.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: Test with pytest
102102
uses: ./.github/actions/docker-run
103103
with:
104-
id: ${{ steps.build.outputs.unique }}
104+
uid: ${{ steps.build.outputs.unique }}
105105
env: |
106106
CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
107107
OMP_NUM_THREADS=1
@@ -111,7 +111,7 @@ jobs:
111111
- name: Test acoustic example with MPI
112112
uses: ./.github/actions/docker-run
113113
with:
114-
id: ${{ steps.build.outputs.unique }}
114+
uid: ${{ steps.build.outputs.unique }}
115115
args: ${{ matrix.mpiflag }}
116116
env: |
117117
DEVITO_MPI=1
@@ -123,7 +123,7 @@ jobs:
123123
uses: ./.github/actions/docker-run
124124
with:
125125
# --name examplerun
126-
id: ${{ steps.build.outputs.unique }}
126+
uid: ${{ steps.build.outputs.unique }}
127127
args: ${{ matrix.mpiflag }}
128128
env: |
129129
DEVITO_MPI=1

0 commit comments

Comments
 (0)