Skip to content

Commit 80214f0

Browse files
committed
Move prerelease tag making into separate workflow
Previously, the prerelease tag would be created when the prerelease PR was opened. This means that changes to the agent after the prerelease PR was opened would not be reflected in the tag used for validation with internal apps.
1 parent e6a6f4a commit 80214f0

File tree

2 files changed

+35
-11
lines changed

2 files changed

+35
-11
lines changed

.github/workflows/prerelease.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,4 @@ jobs:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343
TITLE: "Prerelease ${{env.prerelease_tag}}"
4444
BODY: "Updates the version number, changelog, and newrelic.yml (if it needs updating). This is an automated PR."
45-
LABEL: prerelease
46-
47-
- name: Create pre release tag
48-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # tag v2.5.0
49-
with:
50-
tag_name: ${{ env.prerelease_tag }}
51-
name: ${{ env.prerelease_tag }}
52-
target_commitish: prerelease_updates_${{ env.prerelease_tag }}
53-
prerelease: true
54-
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
LABEL: prerelease
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Create Release PR
2+
3+
on:
4+
pull_request:
5+
types:
6+
- closed
7+
8+
jobs:
9+
create_prerelease_tag:
10+
if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'prerelease')) }}
11+
runs-on: ubuntu-22.04
12+
steps:
13+
- name: Install Ruby 3.4
14+
uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # tag v1.287.0
15+
with:
16+
ruby-version: 3.4
17+
18+
- name: Checkout code
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # tag v6.0.2
20+
21+
- run: bundle install
22+
23+
- name: Set prerelease tag env var
24+
run: echo "prerelease_tag=$(bundle exec rake newrelic:version:current)-pre" >> $GITHUB_ENV
25+
26+
- name: Make tag
27+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # tag v2.5.0
28+
with:
29+
tag_name: ${{ env.prerelease_tag }}
30+
name: ${{ env.prerelease_tag }}
31+
target_commitish: prerelease_updates_${{ env.prerelease_tag }}
32+
prerelease: true
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)