diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b155c50..e924d77c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,16 +71,14 @@ defaults: shell: bash jobs: - bump-version-generate-changelog: - name: Bump package version, Generate changelog + name: "Bump package version, Generate changelog" uses: dbt-labs/dbt-adapters/.github/workflows/release_prep_hatch.yml@bumpVersion with: version_number: ${{ inputs.version_number }} deploy_to: ${{ inputs.deploy-to }} nightly_release: ${{ inputs.nightly_release }} target_branch: ${{ inputs.target_branch }} - secrets: inherit log-outputs-bump-version-generate-changelog: @@ -126,13 +124,13 @@ jobs: name: "GitHub Release" if: ${{ !failure() && !cancelled() }} - needs: [build-and-test, log-outputs-bump-version-generate-changelog] + needs: [build-and-test, bump-version-generate-changelog] uses: dbt-labs/dbt-adapters/.github/workflows/github-release.yml@bumpVersion with: + sha: ${{ needs.bump-version-generate-changelog.outputs.final_sha }} version_number: ${{ inputs.version_number }} changelog_path: ${{ needs.bump-version-generate-changelog.outputs.changelog_path }} test_run: ${{ inputs.deploy-to == 'test' && true || false }} - sha: ${{ needs.bump-version-generate-changelog.outputs.final_sha }} artifact_name: ${{ inputs.version_number }}-${{ inputs.package }}-${{ inputs.deploy-to }} pypi-release: diff --git a/.github/workflows/release_prep_hatch.yml b/.github/workflows/release_prep_hatch.yml index e9e613bd..b23ded37 100644 --- a/.github/workflows/release_prep_hatch.yml +++ b/.github/workflows/release_prep_hatch.yml @@ -204,6 +204,7 @@ jobs: - name: "[DEBUG] Print Outputs" run: | echo up_to_date: ${{ steps.version-check.outputs.up_to_date }} + skip-generate-changelog: runs-on: ubuntu-latest needs: [audit-changelog] @@ -216,6 +217,7 @@ jobs: title="Skip changelog generation" message="A changelog file already exists at ${{ needs.audit-changelog.outputs.changelog_path }}, skipping generating changelog" echo "::notice title=${{ env.NOTIFICATION_PREFIX }}: $title::$message" + skip-version-bump: runs-on: ubuntu-latest needs: [audit-version-in-code] @@ -228,6 +230,7 @@ jobs: title="Skip version bump" message="The version has already been bumped to ${{ inputs.version_number }}, skipping version bump" echo "::notice title=${{ env.NOTIFICATION_PREFIX }}: $title::$message" + create-temp-branch: runs-on: ubuntu-latest needs: [audit-changelog, audit-version-in-code]