Skip to content

Commit 7ab47f1

Browse files
committed
try stable branch
1 parent 7a88c2c commit 7ab47f1

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/build-and-release.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
description: 'Version - patch version of the release (e.g. x.y.z)'
99
required: true
1010
type: string
11-
release_commit_branch:
12-
description: 'Release Commit Branch - the branch on which the release commit will be made.'
13-
required: true
14-
type: string
1511
draft:
1612
description: 'Draft - true if the release should be a draft'
1713
required: true
@@ -76,7 +72,6 @@ jobs:
7672
runs-on: ubuntu-latest
7773
outputs:
7874
commit_hash: ${{ steps.empty-commit.outputs.commit_hash }}
79-
# release-ref-or-commit: ${{ steps.resolve-release-commit.outputs.release-ref-or-commit }}
8075
steps:
8176
- uses: actions/create-github-app-token@v1
8277
id: app-token
@@ -85,17 +80,20 @@ jobs:
8580
private-key: ${{ secrets.RELEASE_CONTROLLER_APP_PRIVATE_KEY }}
8681
owner: ${{ github.repository_owner }}
8782
repositories: "backup-utils,backup-utils-private"
83+
- name: Get major-feature from version
84+
id: get-major-feature
85+
run: |
86+
echo "major-feature=\"$(echo "${{ github.event.inputs.version }}" | cut -d '.' -f 1,2)\"" >> "$GITHUB_OUTPUT"
8887
- name: Checkout backup-utils
8988
uses: actions/checkout@v4
9089
with:
9190
token: ${{ steps.app-token.outputs.token }}
9291
repository: github/backup-utils
9392
- name: Create empty commit
94-
# if: github.event.inputs.release_commit_branch == ''
9593
uses: stefanzweifel/git-auto-commit-action@v4
9694
id: empty-commit
9795
with:
98-
branch: ${{ github.event.inputs.release_commit_branch }}
96+
branch: ${{ steps.get-major-feature.outputs.major-feature}}-stable
9997
commit_message: "Test ${{ github.event.inputs.version }} release commit"
10098
commit_user_name: "release-controller[bot]"
10199
commit_user_email: "223695+release-controller[bot]@users.noreply.github.com"
@@ -134,10 +132,10 @@ jobs:
134132
name: |
135133
GitHub Enterprise Server Backup Utilities v${{ github.event.inputs.version }}
136134
artifacts: |
137-
github-backup-utils-v${{ github.event.inputs.version }}.tar.gz, \
135+
github-backup-utils-v${{ github.event.inputs.version }}.tar.gz,
138136
github-backup-utils_${{ github.event.inputs.version }}_all.deb
139137
tag: v${{ github.event.inputs.version }}
140-
commit: 3.9-main
138+
commit: ${{ steps.get-major-feature.outputs.major-feature}}-stable
141139
bodyFile: release-notes/${{ github.event.inputs.version }}.md
142140
draft: ${{ github.event.inputs.draft }}
143141
allowUpdates: true

0 commit comments

Comments
 (0)