diff --git a/.github/workflows/release_crates.yml b/.github/workflows/release_crates.yml index 6ff22b909c692..91a1c71ff5048 100644 --- a/.github/workflows/release_crates.yml +++ b/.github/workflows/release_crates.yml @@ -41,8 +41,8 @@ jobs: env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} run: | - TAG=`cargo release-oxc publish --release crates` - echo "TAG=${TAG}" >> $GITHUB_OUTPUT + cargo release-oxc publish --release crates + echo "TAG=$(cat ./target/OXC_VERSION)" >> $GITHUB_OUTPUT - name: Tag and Push run: | diff --git a/.github/workflows/release_oxlint.yml b/.github/workflows/release_oxlint.yml index 46c757a6ed4f8..f7251af03db36 100644 --- a/.github/workflows/release_oxlint.yml +++ b/.github/workflows/release_oxlint.yml @@ -149,29 +149,11 @@ jobs: - name: Run id: run run: | - { - echo 'OUTPUT<> $GITHUB_OUTPUT - - - name: Save Version - id: version - run: | - { - echo 'VERSION<> $GITHUB_OUTPUT - - - name: Save Changelog - id: changelog - run: | + cargo release-oxc changelog --release oxlint + echo "VERSION=$(cat ./target/OXC_VERSION)" >> $GITHUB_OUTPUT { echo 'CHANGELOG<> $GITHUB_OUTPUT @@ -212,11 +194,11 @@ jobs: - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: - body: ${{ steps.changelog.outputs.CHANGELOG }} + body: ${{ steps.run.outputs.CHANGELOG }} draft: true files: oxlint-* - name: oxlint v${{ steps.version.outputs.VERSION }} - tag_name: oxlint_v${{ steps.version.outputs.VERSION }} + name: oxlint v${{ steps.run.outputs.VERSION }} + tag_name: oxlint_v${{ steps.run.outputs.VERSION }} fail_on_unmatched_files: true target_commitish: ${{ github.sha }} diff --git a/.github/workflows/reusable_prepare_release.yml b/.github/workflows/reusable_prepare_release.yml index 762e821b1c2a8..8d1b5709edef6 100644 --- a/.github/workflows/reusable_prepare_release.yml +++ b/.github/workflows/reusable_prepare_release.yml @@ -42,29 +42,11 @@ jobs: - name: Run id: run run: | - { - echo 'OUTPUT<> $GITHUB_OUTPUT - - - name: Save Version - id: version - run: | - { - echo 'VERSION<> $GITHUB_OUTPUT - - - name: Save Changelog - id: changelog - run: | + cargo release-oxc update --release ${{ inputs.name }} + echo "VERSION=$(cat ./target/OXC_VERSION)" >> $GITHUB_OUTPUT { echo 'CHANGELOG<> $GITHUB_OUTPUT @@ -81,6 +63,6 @@ jobs: branch: release/${{ inputs.name }} branch-suffix: timestamp base: main - title: Release ${{ inputs.name }} v${{ steps.version.outputs.VERSION }} - body: ${{ steps.changelog.outputs.CHANGELOG }} + title: Release ${{ inputs.name }} v${{ steps.run.outputs.VERSION }} + body: ${{ steps.run.outputs.CHANGELOG }} assignees: Boshen