Skip to content

Commit 5afa430

Browse files
committed
Update release automation
1 parent 98413c2 commit 5afa430

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: 'Prepare Release'
32

43
on:
@@ -7,13 +6,13 @@ on:
76
permissions: {}
87

98
jobs:
10-
get_next_release_version:
9+
get_version:
1110
runs-on: ubuntu-latest
1211
outputs:
13-
version: ${{ steps.next_release.outputs.version }}
12+
version: ${{ steps.version.outputs.value }}
1413
steps:
1514
- name: Check out repo
16-
uses: actions/checkout@v6
15+
uses: actions/checkout@v4
1716
with:
1817
fetch-depth: 0
1918

@@ -23,17 +22,18 @@ jobs:
2322
ruby-version: '3.3'
2423
bundler-cache: true
2524

26-
- name: Get next release version
27-
id: next_release
25+
- name: Calculate next version
26+
id: version
2827
run: |
29-
echo version=$(bundle exec rake vox:version:next) >> "$GITHUB_OUTPUT"
28+
VERSION=$(bundle exec rake vox:version:next)
29+
echo "Next version: $VERSION"
30+
echo "value=$VERSION" >> "$GITHUB_OUTPUT"
3031
3132
prepare_release:
32-
needs: get_next_release_version
33+
needs: get_version
3334
uses: OpenVoxProject/shared-actions/.github/workflows/prepare_release.yml@main
3435
with:
35-
allowed_owner: 'OpenVoxProject'
36-
version: ${{ needs.get_next_release_version.outputs.version }}
36+
version: ${{ needs.get_version.outputs.version }}
3737
secrets:
3838
github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
3939
ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}

.github/workflows/release.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: 'Release'
32

43
on:
@@ -7,33 +6,33 @@ on:
76
permissions: {}
87

98
jobs:
10-
get_current_release_version:
9+
get_version:
1110
runs-on: ubuntu-latest
1211
outputs:
13-
version: ${{ steps.current_release.outputs.version }}
12+
version: ${{ steps.version.outputs.value }}
1413
steps:
1514
- name: Check out repo
16-
uses: actions/checkout@v6
17-
with:
18-
fetch-depth: 0
15+
uses: actions/checkout@v4
1916

2017
- name: Setup Ruby
2118
uses: ruby/setup-ruby@v1
2219
with:
2320
ruby-version: '3.3'
2421
bundler-cache: true
2522

26-
- name: Get current release version
27-
id: current_release
23+
- name: Get version from CHANGELOG.md
24+
id: version
2825
run: |
29-
echo version=$(bundle exec rake vox:version:current) >> "$GITHUB_OUTPUT"
26+
VERSION=$(bundle exec rake vox:version:current)
27+
echo "Version: $VERSION"
28+
echo "value=$VERSION" >> "$GITHUB_OUTPUT"
3029
3130
release:
31+
needs: get_version
3232
uses: OpenVoxProject/shared-actions/.github/workflows/release.yml@main
33-
needs: get_current_release_version
3433
with:
35-
allowed_owner: 'OpenVoxProject'
36-
version: ${{ needs.get_current_release_version.outputs.version }}
34+
version: ${{ needs.get_version.outputs.version }}
35+
include_changelog_in_release: true
3736
secrets:
3837
github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
3938
ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}

0 commit comments

Comments
 (0)