Skip to content

Commit 78d4a34

Browse files
committed
fix dev release if merged
1 parent 31131c1 commit 78d4a34

File tree

2 files changed

+15
-32
lines changed

2 files changed

+15
-32
lines changed

.github/workflows/ci-tests.yml

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -108,31 +108,28 @@ jobs:
108108
cd packages/controller/test/redis-sentinel
109109
./test-sentinel.sh
110110
111-
debug:
112-
runs-on: ubuntu-latest
113-
steps:
114-
- name: debug
115-
run: |
116-
echo ${{ github.event_name }}
117-
echo ${{ github.event.pull_request.user.login }}
118-
echo ${{ contains( github.event.pull_request.labels.*.name, 'automated pr') }}
119-
echo ${{ github.event.pull_request.base.ref }}
120-
121111
auto-merge:
122112
if: |
123113
always() &&
124114
github.event_name == 'pull_request' &&
125115
github.event.pull_request.user.login == 'foxriver76' &&
126-
contains( github.event.pull_request.labels.*.name, 'automated pr') &&
127-
github.event.pull_request.base.ref == 'refs/heads/master'
116+
github.event.pull_request.base.ref == 'master' &&
117+
startsWith(github.event.pull_request.title, '[NIGHTLY DEV RELEASE]')
128118
129119
needs: [ ci ]
130120
runs-on: ubuntu-latest
131121
steps:
122+
- name: Determine version
123+
id: version
124+
uses: actions/github-script@v6
125+
with:
126+
result-encoding: string
127+
script: |
128+
return require(`${process.env.GITHUB_WORKSPACE}/lerna.json`).version;
129+
132130
- name: Publish npm
133-
if: steps.automerge.outputs.mergeResult == 'merged'
134131
env:
135-
VERSION: ${{ github.event.pull_request.title }}
132+
VERSION: ${{ steps.version.outputs.result }}
136133
run: |
137134
npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
138135
npm whoami
@@ -141,32 +138,18 @@ jobs:
141138
142139
- name: Create Github Release for Nightly
143140
uses: ncipollo/release-action@v1
144-
if: steps.automerge.outputs.mergeResult == 'merged'
145-
env:
146-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
147-
with:
148-
tag: v${{ github.event.pull_request.title }}
149-
name: Release v${{ github.event.pull_request.title }}
150-
draft: false
151-
prerelease: true
152-
body: 'nightly release'
153-
154-
- name: Create Github Release for Nightly
155-
uses: ncipollo/release-action@v1
156-
if: steps.automerge.outputs.mergeResult == 'merged'
157141
env:
158142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
159143
with:
160-
tag: v${{ github.event.pull_request.title }}
161-
name: Release v${{ github.event.pull_request.title }}
144+
tag: v${{ steps.version.outputs.result }}
145+
name: Release v${{ steps.version.outputs.result }}
162146
draft: false
163147
prerelease: true
164148
body: 'nightly release'
165149

166150
- name: Notify Sentry.io about the Nightly release#
167-
if: steps.automerge.outputs.mergeResult == 'merged'
168151
env:
169-
VERSION: ${{ github.event.pull_request.title }}
152+
VERSION: ${{ steps.version.outputs.result }}
170153
run: |
171154
npm i -g @sentry/cli
172155
export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/nightly-dev-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
signoff: false
136136
branch: nightly-release
137137
delete-branch: true
138-
title: ${{ steps.version.outputs.result }}
138+
title: "[NIGHTLY DEV RELEASE] ${{ steps.version.outputs.result }}"
139139
body: |
140140
Update version by nightly dev release
141141
labels: |

0 commit comments

Comments
 (0)