Skip to content

Commit 6d61222

Browse files
authored
Update merge-requires.yml (#274)
* Update merge-requires.yml Debug release action AB#10062 Signed-off-by: Paul Hewlett <1104895+eccles@users.noreply.github.com> * Update merge-requires.yml Fix github action Remove the release requires logic - we dont want the release to be triggered until we actually release otherwise the action erroneously attempts to upload a wheel to pypi with a spurious 0.0.1 tag. Additionally the release action publishes documentation to github pages and that **must not** happen until we release. This also simplifies logic in the merge-requires workflow - the test for github.event_name == 'release' did not apparently work. AB#10062 --------- Signed-off-by: Paul Hewlett <1104895+eccles@users.noreply.github.com>
1 parent 7710adb commit 6d61222

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
# This workflow configures the repository specific choices of which CI builds
2-
# must pass in order for a build to merge. This allows a sinlge global teraform
2+
# must pass in order for a build to merge. This allows a single global teraform
33
# configured rule to require a "well known" check in each repository. Whilst
44
# granting repository stakeholders the ability configure what workflows are
55
# appropriate to satisfy that check.
66
name: Merge Requires
7-
on:
8-
push:
7+
8+
on: [pull_request]
99

1010
jobs:
1111
ci:
1212
secrets: inherit
1313
uses: ./.github/workflows/ci.yml
14-
release:
15-
if: ${{ github.event_name == 'release' }}
16-
secrets: inherit
17-
uses: ./.github/workflows/package.yml
1814

1915
merge-checks-ok:
2016
runs-on: ubuntu-latest
@@ -23,12 +19,3 @@ jobs:
2319
- name: ok
2420
run: |
2521
echo "This code is mergeable"
26-
27-
release-checks-ok:
28-
runs-on: ubuntu-latest
29-
if: ${{ github.event_name == 'release' }}
30-
needs: [ci, release]
31-
steps:
32-
- name: ok
33-
run: |
34-
echo "This code is releasable"

.github/workflows/package.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
name: Package and Publish
55

66
on:
7-
workflow_call:
7+
release:
8+
types: [created]
89

910
jobs:
10-
build:
11+
deploy:
1112

1213
runs-on: ubuntu-latest
1314

0 commit comments

Comments
 (0)