Skip to content

Commit 4bc5481

Browse files
authored
Merge pull request #505 from input-output-hk/ci/fail-instead-of-cancellation
ci: nightly and release workflow fixes
2 parents 78d6753 + 42e71ce commit 4bc5481

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

.github/workflows/nightly-publish.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@ on:
88
- completed
99

1010
jobs:
11-
cancel-self-run:
12-
name: "Cancel the self workflow run"
11+
fail:
12+
name: "Fail the workflow run by exiting"
1313
if: ${{ github.event_name != 'workflow_dispatch' && github.event.workflow_run.conclusion != 'success' }}
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- name: "Cancel the self workflow run"
17-
uses: potiuk/cancel-workflow-runs@master
18-
with:
19-
cancelMode: self
20-
token: ${{ secrets.BOT_GH_TOKEN }}
21-
notifyPRCancel: false
16+
- name: "exit 1"
17+
run: exit 1
2218

2319
publish:
2420
runs-on: ubuntu-20.04

.github/workflows/nightly-test.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@ on:
88
- completed
99

1010
jobs:
11-
cancel-self-run:
12-
name: "Cancel the self workflow run"
11+
fail:
12+
name: "Fail the workflow run by exiting"
1313
if: ${{ github.event_name != 'workflow_dispatch' && github.event.workflow_run.conclusion != 'success' }}
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- name: "Cancel the self workflow run"
17-
uses: potiuk/cancel-workflow-runs@master
18-
with:
19-
cancelMode: self
20-
token: ${{ secrets.BOT_GH_TOKEN }}
21-
notifyPRCancel: false
16+
- name: "exit 1"
17+
run: exit 1
2218

2319
test:
2420
strategy:

.github/workflows/release.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ jobs:
4747
# Base on nightly branch versions
4848
git merge --squash nightly
4949
# Omit nighly release CHANGELOG changes
50-
git checkout HEAD packages/*/CHANGELOG.md
50+
git restore --source master packages/*/CHANGELOG.md
51+
git add .
52+
# Test build to reduce chance of failure after creating a GH Release
53+
yarn build
5154
# Publish
5255
yarn publish:release --sign-git-commit --loglevel silly
5356
# Merge package.json/yarn.lock/CHANGELOG back to nightly
@@ -58,4 +61,4 @@ jobs:
5861
YARN_ENABLE_IMMUTABLE_INSTALLS: false
5962
NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }}
6063
# Used for making a release
61-
GH_TOKEN: ${{ github.token }}
64+
GH_TOKEN: ${{ secrets.BOT_GH_TOKEN }}

0 commit comments

Comments
 (0)