1.2 update version-bump GHA (#564)

* 1.2 update version-bump GHA * Bumping version to 1.2.1rc0 and generate CHANGELOG (#567) Co-authored-by: Github Build Bot <[email protected]> * Bumping version to 1.2.1 and generate CHANGELOG (#570) Co-authored-by: Github Build Bot <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Build Bot <[email protected]>
dbt-labs · Dec 20, 2022 · e912708 · e912708
1 parent ad4f0d2
commit e912708
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 119 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.2.1
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)

diff --git a/.changes/1.2.1.md b/.changes/1.2.1.md
@@ -0,0 +1,11 @@
+## dbt-spark 1.2.1 - December 20, 2022
+### Features
+- backport changie to 1.2.latest ([#417](https://github.com/dbt-labs/dbt-spark/issues/417), [#418](https://github.com/dbt-labs/dbt-spark/pull/418))
+### Fixes
+- Support new error messages in the future Spark. ([#515](https://github.com/dbt-labs/dbt-spark/issues/515), [#520](https://github.com/dbt-labs/dbt-spark/pull/520))
+### Under the Hood
+- updating python version in tox ([#536](https://github.com/dbt-labs/dbt-spark/issues/536), [#534](https://github.com/dbt-labs/dbt-spark/pull/534))
+- fix post new release tox issues around passenv and allowlist_externals ([#545](https://github.com/dbt-labs/dbt-spark/issues/545), [#545](https://github.com/dbt-labs/dbt-spark/pull/545))
+
+### Contributors
+- [@ueshin](https://github.com/ueshin) ([#520](https://github.com/dbt-labs/dbt-spark/pull/520))
diff --git a/.changes/unreleased/Features-20220809-163220.yaml b/.changes/unreleased/Features-20220809-163220.yaml
diff --git a/.changes/unreleased/Fixes-20221116-234601.yaml b/.changes/unreleased/Fixes-20221116-234601.yaml
diff --git a/.changes/unreleased/Under the Hood-20221202-140724.yaml b/.changes/unreleased/Under the Hood-20221202-140724.yaml
diff --git a/.changes/unreleased/Under the Hood-20221209-143821.yaml b/.changes/unreleased/Under the Hood-20221209-143821.yaml
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
@@ -1,103 +1,28 @@
 # **what?**
-# This workflow will take a version number and a dry run flag. With that
+# This workflow will take the new version number to bump to. With that
 # it will run versionbump to update the version number everywhere in the
-# code base and then generate an update Docker requirements file. If this
-# is a dry run, a draft PR will open with the changes. If this isn't a dry
-# run, the changes will be committed to the branch this is run on.
+# code base and then run changie to create the corresponding changelog.
+# A PR will be created with the changes that can be reviewed before committing.
 
 # **why?**
 # This is to aid in releasing dbt and making sure we have updated
-# the versions and Docker requirements in all places.
+# the version in all places and generated the changelog.
 
 # **when?**
-# This is triggered either manually OR
-# from the repository_dispatch event "version-bump" which is sent from
-# the dbt-release repo Action
+# This is triggered manually
 
 name: Version Bump
 
 on:
   workflow_dispatch:
     inputs:
       version_number:
-       description: 'The version number to bump to'
+       description: 'The version number to bump to (ex. 1.2.0, 1.3.0b1)'
        required: true
-      is_dry_run:
-       description: 'Creates a draft PR to allow testing instead of committing to a branch'
-       required: true
-       default: 'true'
-  repository_dispatch:
-    types: [version-bump]
 
 jobs:
-  bump:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v2
-
-      - name: Set version and dry run values
-        id: variables
-        env:
-          VERSION_NUMBER: "${{ github.event.client_payload.version_number == '' && github.event.inputs.version_number || github.event.client_payload.version_number }}"
-          IS_DRY_RUN: "${{ github.event.client_payload.is_dry_run == '' && github.event.inputs.is_dry_run || github.event.client_payload.is_dry_run }}"
-        run: |
-          echo Repository dispatch event version: ${{ github.event.client_payload.version_number }}
-          echo Repository dispatch event dry run: ${{ github.event.client_payload.is_dry_run }}
-          echo Workflow dispatch event version: ${{ github.event.inputs.version_number }}
-          echo Workflow dispatch event dry run: ${{ github.event.inputs.is_dry_run }}
-          echo ::set-output name=VERSION_NUMBER::$VERSION_NUMBER
-          echo ::set-output name=IS_DRY_RUN::$IS_DRY_RUN
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-
-      - name: Install python dependencies
-        run: |
-          sudo apt-get install libsasl2-dev
-          python3 -m venv env
-          source env/bin/activate
-          pip install --upgrade pip
-
-      - name: Create PR branch
-        if: ${{ steps.variables.outputs.IS_DRY_RUN  == 'true' }}
-        run: |
-          git checkout -b bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
-          git push origin bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
-          git branch --set-upstream-to=origin/bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
-
-      - name: Bumping version
-        run: |
-          source env/bin/activate
-          pip install -r dev-requirements.txt
-          env/bin/bumpversion --allow-dirty --new-version ${{steps.variables.outputs.VERSION_NUMBER}} major
-          git status
-
-      - name: Commit version bump directly
-        uses: EndBug/add-and-commit@v7
-        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'false' }}
-        with:
-          author_name: 'Github Build Bot'
-          author_email: '[email protected]'
-          message: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
-
-      - name: Commit version bump to branch
-        uses: EndBug/add-and-commit@v7
-        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
-        with:
-          author_name: 'Github Build Bot'
-          author_email: '[email protected]'
-          message: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
-          branch: 'bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'
-          push: 'origin origin/bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
-        with:
-          author: 'Github Build Bot <[email protected]>'
-          draft: true
-          base: ${{github.ref}}
-          title: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
-          branch: 'bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'
+  version_bump_and_changie:
+    uses: dbt-labs/actions/.github/workflows/version-bump.yml@main
+    with:
+      version_number: ${{ inputs.version_number }}
+    secrets: inherit  # ok since what we are calling is internally maintained
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@
 - Changes are listed under the (pre)release in which they first appear. Subsequent releases include changes from previous releases.
 - "Breaking changes" listed under a version may require action from end users or external maintainers when upgrading to that version.
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie). For details on how to document a change, see [the contributing guide](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.md#adding-changelog-entry)
+## dbt-spark 1.2.1 - December 20, 2022
+### Features
+- backport changie to 1.2.latest ([#417](https://github.com/dbt-labs/dbt-spark/issues/417), [#418](https://github.com/dbt-labs/dbt-spark/pull/418))
+### Fixes
+- Support new error messages in the future Spark. ([#515](https://github.com/dbt-labs/dbt-spark/issues/515), [#520](https://github.com/dbt-labs/dbt-spark/pull/520))
+### Under the Hood
+- updating python version in tox ([#536](https://github.com/dbt-labs/dbt-spark/issues/536), [#534](https://github.com/dbt-labs/dbt-spark/pull/534))
+- fix post new release tox issues around passenv and allowlist_externals ([#545](https://github.com/dbt-labs/dbt-spark/issues/545), [#545](https://github.com/dbt-labs/dbt-spark/pull/545))
+
+### Contributors
+- [@ueshin](https://github.com/ueshin) ([#520](https://github.com/dbt-labs/dbt-spark/pull/520))
 ## dbt-spark 1.2.0 - July 26, 2022
 
 ### Features
@@ -22,12 +33,11 @@
 - Use dispatch pattern for get_columns_in_relation_raw macro ([#365](https://github.com/dbt-labs/dbt-spark/pull/365))
 
 ### Contributors
-- [@barberscott](https://github.com/barberscott) ([#398](https://github.com/dbt-labs/dbt-spark/pull/398/))
+- [@barberscott](https://github.com/barberscott)  ([#398](https://github.com/dbt-labs/dbt-spark/pull/398/))
 - [@grindheim](https://github.com/grindheim) ([#287](https://github.com/dbt-labs/dbt-spark/pull/287/))
 - [@nssalian](https://github.com/nssalian) ([#349](https://github.com/dbt-labs/dbt-spark/pull/349))
 - [@ueshin](https://github.com/ueshin) ([#365](https://github.com/dbt-labs/dbt-spark/pull/365))
 - [@dbeatty10](https://github.com/dbeatty10) ([#359](https://github.com/dbt-labs/dbt-spark/pull/359))
-
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
 - [1.1](https://github.com/dbt-labs/dbt-spark/blob/1.1.latest/CHANGELOG.md)

diff --git a/dbt/adapters/spark/__version__.py b/dbt/adapters/spark/__version__.py
@@ -1 +1 @@
-version = "1.2.0"
+version = "1.2.1"
diff --git a/setup.py b/setup.py
@@ -50,7 +50,7 @@ def _get_dbt_core_version():
 
 
 package_name = "dbt-spark"
-package_version = "1.2.0"
+package_version = "1.2.1"
 dbt_core_version = _get_dbt_core_version()
 description = """The Apache Spark adapter plugin for dbt"""