From 268f3af7b16338af93e1fde06c76110a21c8577c Mon Sep 17 00:00:00 2001
From: Colin Rogers <111200756+colin-rogers-dbt@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:41:16 -0800
Subject: [PATCH] Add version bump into release.yml (#1147)

* Add version bump into release.yml
* use removeSparkException branch for release-prep
---
 .github/workflows/release.yml | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cdbdaa13f..aba99768e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,6 +56,11 @@ on:
         type: boolean
         default: true
         required: false
+      nightly_release:
+        description: "Nightly release to dev environment"
+        type: boolean
+        default: false
+        required: false
       only_docker:
         description: "Only release Docker image, skip GitHub & PyPI"
         type: boolean
@@ -86,43 +91,38 @@ jobs:
           echo Test run:                           ${{ inputs.test_run }}
           echo Only Docker:                        ${{ inputs.only_docker }}
 
-  # The Spark repository uses CircleCI to run integration tests.
-  # Because of this, the process of version bumps will be manual
-  # which means that this stage will be used to audit the version
-  # and changelog in sources.
-  # We are passing `env_setup_script_path` as an empty string
-  # so that the integration tests stage will be skipped.
-  audit-version-and-changelog:
-    name: "Bump package version, Generate changelog"
-    uses: dbt-labs/dbt-spark/.github/workflows/release-prep.yml@main
+  bump-version-generate-changelog:
+    name: Bump package version, Generate changelog
+    uses: dbt-labs/dbt-release/.github/workflows/release-prep.yml@removeSparkException
     with:
       sha: ${{ inputs.sha }}
       version_number: ${{ inputs.version_number }}
       target_branch: ${{ inputs.target_branch }}
-      env_setup_script_path: ""
+      env_setup_script_path: ${{ inputs.env_setup_script_path }}
       test_run: ${{ inputs.test_run }}
+      nightly_release: ${{ inputs.nightly_release }}
     secrets: inherit
 
-  log-outputs-audit-version-and-changelog:
+  log-outputs-bump-version-generate-changelog:
     name: "[Log output] Bump package version, Generate changelog"
     if: ${{ !failure() && !cancelled() && !inputs.only_docker }}
-    needs: [audit-version-and-changelog]
+    needs: [bump-version-generate-changelog]
     runs-on: ubuntu-latest
     steps:
       - name: Print variables
         run: |
-          echo Final SHA     : ${{ needs.audit-version-and-changelog.outputs.final_sha }}
-          echo Changelog path: ${{ needs.audit-version-and-changelog.outputs.changelog_path }}
+          echo Final SHA     : ${{ needs.bump-version-generate-changelog.outputs.final_sha }}
+          echo Changelog path: ${{ needs.bump-version-generate-changelog.outputs.changelog_path }}
 
   build-test-package:
     name: "Build, Test, Package"
     if: ${{ !failure() && !cancelled() && !inputs.only_docker }}
-    needs: [audit-version-and-changelog]
+    needs: [bump-version-generate-changelog]
     uses: dbt-labs/dbt-release/.github/workflows/build.yml@main
     with:
-      sha: ${{ needs.audit-version-and-changelog.outputs.final_sha }}
+      sha: ${{ needs.bump-version-generate-changelog.outputs.final_sha }}
       version_number: ${{ inputs.version_number }}
-      changelog_path: ${{ needs.audit-version-and-changelog.outputs.changelog_path }}
+      changelog_path: ${{ needs.bump-version-generate-changelog.outputs.changelog_path }}
       build_script_path: ${{ inputs.build_script_path }}
       s3_bucket_name: ${{ inputs.s3_bucket_name }}
       package_test_command: ${{ inputs.package_test_command }}
@@ -134,12 +134,12 @@ jobs:
   github-release:
     name: "GitHub Release"
     if: ${{ !failure() && !cancelled() && !inputs.only_docker }}
-    needs: [audit-version-and-changelog, build-test-package]
+    needs: [bump-version-generate-changelog, build-test-package]
     uses: dbt-labs/dbt-release/.github/workflows/github-release.yml@main
     with:
-      sha: ${{ needs.audit-version-and-changelog.outputs.final_sha }}
+      sha: ${{ needs.bump-version-generate-changelog.outputs.final_sha }}
       version_number: ${{ inputs.version_number }}
-      changelog_path: ${{ needs.audit-version-and-changelog.outputs.changelog_path }}
+      changelog_path: ${{ needs.bump-version-generate-changelog.outputs.changelog_path }}
       test_run: ${{ inputs.test_run }}
 
   pypi-release: