Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker image creation from stable branch #2297

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Fix docker image creation from stable branch #2297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions .github/workflows/testing.yml
View file
Open in desktop
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,21 @@ 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
# The image creation is intentionally only triggered for push events because
# scheduled tests should just check that new dependency versions do not break the
# tests, but should not update the image.
if: ${{ 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 }}

- name: Reinstall dependencies if changed
if: ${{ success() && env.triggerdockerbuild == 'yes' }}
Expand Down Expand Up @@ -111,7 +122,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 +131,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 }}
Loading