diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 29358ee0..47287f2e 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -1,4 +1,3 @@ ---- name: 'Prepare Release' on: @@ -7,10 +6,10 @@ on: permissions: {} jobs: - get_next_release_version: + get_version: runs-on: ubuntu-latest outputs: - version: ${{ steps.next_release.outputs.version }} + version: ${{ steps.version.outputs.value }} steps: - name: Check out repo uses: actions/checkout@v6 @@ -24,16 +23,17 @@ jobs: bundler-cache: true - name: Get next release version - id: next_release + id: version run: | - echo version=$(bundle exec rake vox:version:next) >> "$GITHUB_OUTPUT" + VERSION=$(bundle exec rake vox:version:next) + echo "Next version: $VERSION" + echo "value=$VERSION" >> "$GITHUB_OUTPUT" prepare_release: - needs: get_next_release_version + needs: get_version uses: OpenVoxProject/shared-actions/.github/workflows/prepare_release.yml@main with: - allowed_owner: 'OpenVoxProject' - version: ${{ needs.get_next_release_version.outputs.version }} + version: ${{ needs.get_version.outputs.version }} secrets: github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }} ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83495721..4600a959 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,3 @@ ---- name: 'Release' on: @@ -7,10 +6,10 @@ on: permissions: {} jobs: - get_current_release_version: + get_version: runs-on: ubuntu-latest outputs: - version: ${{ steps.current_release.outputs.version }} + version: ${{ steps.version.outputs.value }} steps: - name: Check out repo uses: actions/checkout@v6 @@ -23,17 +22,19 @@ jobs: ruby-version: '3.3' bundler-cache: true - - name: Get current release version - id: current_release + - name: Get version from CHANGELOG.md + id: version run: | - echo version=$(bundle exec rake vox:version:current) >> "$GITHUB_OUTPUT" + VERSION=$(bundle exec rake vox:version:current) + echo "Version: $VERSION" + echo "value=$VERSION" >> "$GITHUB_OUTPUT" release: + needs: get_version uses: OpenVoxProject/shared-actions/.github/workflows/release.yml@main - needs: get_current_release_version with: - allowed_owner: 'OpenVoxProject' - version: ${{ needs.get_current_release_version.outputs.version }} + version: ${{ needs.get_version.outputs.version }} + include_changelog_in_release: true secrets: github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }} ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}