Skip to content

Commit

Permalink
Remove redundant testing_gsoc.yml workflow (#2333)
Browse files Browse the repository at this point in the history
  • Loading branch information
matrss authored Apr 23, 2024
1 parent 30596e2 commit 3e0f74c
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 75 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/testing-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
uses:
./.github/workflows/testing.yml
with:
branch_name: develop
event_name: ${{ github.event_name }}
image_suffix: develop
secrets:
PAT: ${{ secrets.PAT }}
16 changes: 16 additions & 0 deletions .github/workflows/testing-gsoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: test GSoC

on:
push:
branches:
- 'GSOC**'
pull_request:
branches:
- 'GSOC**'

jobs:
test-gsoc:
uses:
./.github/workflows/testing.yml
with:
image_suffix: develop
3 changes: 1 addition & 2 deletions .github/workflows/testing-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
uses:
./.github/workflows/testing.yml
with:
branch_name: stable
event_name: ${{ github.event_name }}
image_suffix: stable
secrets:
PAT: ${{ secrets.PAT }}
22 changes: 9 additions & 13 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,21 @@ name: Pytest MSS
on:
workflow_call:
inputs:
branch_name:
required: true
type: string
event_name:
image_suffix:
required: true
type: string
secrets:
PAT:
required: true

env:
mamba-env: mss-${{ inputs.branch_name }}-env
mamba-env: mss-${{ inputs.image_suffix }}-env

jobs:
Test-MSS:
runs-on: ubuntu-latest

container:
image: openmss/testing-${{ inputs.branch_name }}
image: openmss/testing-${{ inputs.image_suffix }}

strategy:
fail-fast: false
Expand All @@ -36,24 +32,24 @@ jobs:
(echo Dependencies differ && echo "triggerdockerbuild=yes" >> $GITHUB_ENV )

- name: Install pyvirtualdisplay if on stable
if: ${{ inputs.branch_name == 'stable' }}
if: ${{ inputs.image_suffix == 'stable' }}
run: |
source /opt/conda/etc/profile.d/conda.sh
source /opt/conda/etc/profile.d/mamba.sh
mamba install -n mss-${{ inputs.branch_name }}-env pyvirtualdisplay
mamba install -n mss-${{ inputs.image_suffix }}-env pyvirtualdisplay
- name: Always rebuild dependencies for scheduled builds (started from testing-scheduled.yml)
if: ${{ inputs.event_name == 'workflow_dispatch' }}
if: ${{ github.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' && matrix.order == 'normal' }}
if: ${{ (github.ref_name == 'stable' || github.ref_name == 'develop') && github.event_name == 'push' && env.triggerdockerbuild == 'yes' && matrix.order == 'normal' }}
uses: benc-uk/[email protected]
with:
workflow: Update Image testing-${{ inputs.branch_name }}
workflow: Update Image testing-${{ inputs.image_suffix }}
repo: Open-MSS/dockertesting
ref: main
token: ${{ secrets.PAT }}
Expand Down Expand Up @@ -81,7 +77,7 @@ jobs:
${{ (matrix.order == 'normal' && ' ') || (matrix.order == 'reverse' && '--reverse') }} tests

- name: Collect coverage
if: ${{ (inputs.event_name == 'push' || inputs.event_name == 'pull_request') && matrix.order == 'normal' }}
if: ${{ (github.event_name == 'push' || github.event_name == 'pull_request') && matrix.order == 'normal' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down
58 changes: 0 additions & 58 deletions .github/workflows/testing_gsoc.yml

This file was deleted.

0 comments on commit 3e0f74c

Please sign in to comment.