From fd94448a02ff836a9f81190dfdf4da316b437675 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 2 Dec 2024 11:27:52 -0800 Subject: [PATCH 1/4] Add version bump into release.yml --- .github/workflows/release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cdbdaa13f..5de7d6321 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,27 +91,22 @@ 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@main 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: 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 From e2f947f1321774df7dbab7fee3d784c25f74b3e9 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 2 Dec 2024 11:31:55 -0800 Subject: [PATCH 2/4] Add version bump into release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5de7d6321..24470c045 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,7 +103,7 @@ jobs: 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: [bump-version-generate-changelog] @@ -111,8 +111,8 @@ jobs: 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" From 5d162f27d6a605dfa93c20943df2b1cb2c6169fa Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 2 Dec 2024 11:34:39 -0800 Subject: [PATCH 3/4] Add version bump into release.yml --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24470c045..c5e05edc9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -117,12 +117,12 @@ jobs: 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: From 0956f0a6f7a2828969888fb3f7beb34bf9b713ce Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 2 Dec 2024 11:42:48 -0800 Subject: [PATCH 4/4] use removeSparkException branch for release-prep --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5e05edc9..aba99768e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,7 +93,7 @@ jobs: bump-version-generate-changelog: name: Bump package version, Generate changelog - uses: dbt-labs/dbt-release/.github/workflows/release-prep.yml@main + uses: dbt-labs/dbt-release/.github/workflows/release-prep.yml@removeSparkException with: sha: ${{ inputs.sha }} version_number: ${{ inputs.version_number }}