Skip to content

Commit df12918

Browse files
authored
Merge pull request #1372 from nginx/release-2.44.0
Merge release-2.44.0 back into dev-v2
2 parents ea504e0 + 28ed8c1 commit df12918

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

.github/workflows/release-branch.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ env:
55
on:
66
workflow_dispatch:
77
inputs:
8+
releaseBranch:
9+
description: 'Release branch to build & publish from'
10+
required: true
11+
type: string
12+
packageVersion:
13+
description: 'Agent version'
14+
required: false
15+
type: string
16+
default: ''
817
publishPackages:
9-
description: 'Publish packages to up-ap.nginx.com'
18+
description: 'Publish packages to upload host'
1019
required: true
1120
type: boolean
1221
default: false
@@ -22,35 +31,33 @@ permissions:
2231

2332
jobs:
2433
update-draft:
34+
name: Update Release
35+
runs-on: ubuntu-22.04-amd64
2536
permissions:
2637
contents: write
2738
pull-requests: write
39+
id-token: write
2840

29-
name: Update Release
30-
runs-on: ubuntu-22.04-amd64
3141
steps:
32-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
42+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3343
with:
3444
fetch-depth: 0
45+
ref: ${{ inputs.releaseBranch }}
3546

3647
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3748
with:
3849
go-version-file: 'go.mod'
3950

40-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
41-
42-
- run: npm install semver@7.6.2
43-
4451
- name: Create Draft Release
4552
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
4653
id: release
54+
env:
55+
version: ${{ inputs.packageVersion }}
4756
with:
4857
script: |
49-
const semver = require('semver');
5058
const ref = context.ref.split("/")[2]
51-
const version_number = ref.split("-")[1]
52-
const version = "v"+version_number
53-
console.log(`The release version is ${version}`)
59+
const {version} = process.env
60+
console.log(`The release version is v${version}`)
5461
5562
const releases = (await github.rest.repos.listReleases({
5663
owner: context.payload.repository.owner.login,
@@ -65,7 +72,7 @@ jobs:
6572
6673
console.log(`The latest release was ${latest_release}`)
6774
68-
if (latest_release === version) {
75+
if (latest_release === "v"+version) {
6976
core.setFailed(`A published release already exists for ${latest_release}`)
7077
} else {
7178
const draft = releases.find((r) => r.draft && r.tag_name === version)
@@ -97,7 +104,7 @@ jobs:
97104
release = (await github.rest.repos.createRelease({
98105
owner: context.payload.repository.owner.login,
99106
repo: context.payload.repository.name,
100-
tag_name: version,
107+
tag_name: "v"+version,
101108
target_commitish: ref,
102109
name: version,
103110
body: release_notes.data.body + footer,
@@ -110,7 +117,7 @@ jobs:
110117
console.log(`Release Upload URL: ${release.data.upload_url}`)
111118
112119
return {
113-
version: version_number,
120+
version: version,
114121
release_id: release.data.id,
115122
release_upload_url: release.data.upload_url,
116123
}

0 commit comments

Comments
 (0)