Skip to content

Commit

Permalink
Fix docker image creation from stable branch
Browse files Browse the repository at this point in the history
This changes the image creation logic in testing.yml to always trigger a
build when a workflow_dispatch is used to run the workflow.
  • Loading branch information
matrss committed Mar 22, 2024
1 parent 5c75fde commit 4280f1a
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Pytest MSS

on:
on:
workflow_call:
inputs:
xdist:
Expand Down Expand Up @@ -50,10 +50,18 @@ jobs:
source /opt/conda/etc/profile.d/mamba.sh
mamba install -n mss-${{ inputs.branch_name }}-env pyvirtualdisplay
- name: Always rebuild dependencies for scheduled builds
if: ${{ success() && inputs.event_name == 'schedule' && inputs.branch_name == 'stable' && env.triggerdockerbuild != 'yes' }}
run: |
echo "triggerdockerbuild=yes" >> $GITHUB_ENV
- name: Always rebuild dependencies for scheduled builds (started from testing-scheduled.yml)
if: ${{ inputs.event_name == 'workflow_dispatch' }}
run: echo "triggerdockerbuild=yes" >> $GITHUB_ENV

- name: Invoke dockertesting image creation
if: ${{ env.triggerdockerbuild == 'yes' && inputs.xdist == 'no' }}
uses: benc-uk/[email protected]
with:
workflow: Update Image testing-${{ inputs.branch_name }}
repo: Open-MSS/dockertesting
ref: main
token: ${{ secrets.PAT }}

- name: Reinstall dependencies if changed
if: ${{ success() && env.triggerdockerbuild == 'yes' }}
Expand Down Expand Up @@ -111,7 +119,7 @@ jobs:
- name: Collect coverage
if: ${{ success() && inputs.event_name == 'push' && inputs.branch_name == 'develop' && inputs.xdist == 'no'}}
env:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd $GITHUB_WORKSPACE \
Expand All @@ -120,12 +128,3 @@ jobs:
&& mamba activate mss-${{ inputs.branch_name }}-env \
&& mamba install coveralls \
&& coveralls --service=github
- name: Invoke dockertesting image creation
if: ${{ always() && inputs.event_name == 'push' && env.triggerdockerbuild == 'yes' && inputs.xdist == 'no'}}
uses: benc-uk/[email protected]
with:
workflow: Update Image testing-${{ inputs.branch_name }}
repo: Open-MSS/dockertesting
ref: main
token: ${{ secrets.PAT }}

0 comments on commit 4280f1a

Please sign in to comment.