diff --git a/.github/workflows/release-internal.yml b/.github/workflows/release-internal.yml index dc12e3781..cff860595 100644 --- a/.github/workflows/release-internal.yml +++ b/.github/workflows/release-internal.yml @@ -1,4 +1,16 @@ -name: Release internal patch +# What? +# +# Tag and release an arbitrary ref. Uploads to an internal archive for further processing. +# +# How? +# +# After checking out and testing the provided ref, the image is built and uploaded. +# +# When? +# +# Manual trigger. + +name: "Release internal patch" on: workflow_dispatch: @@ -7,58 +19,31 @@ on: description: "The release version number (i.e. 1.0.0b1)" type: string required: true - sha: - description: "The sha to use (leave empty to use latest on main)" - type: string - required: false - package_test_command: - description: "Package test command" - type: string - default: "python -c \"import dbt.adapters.snowflake\"" - required: true - dbms_name: - description: "The name of the warehouse the adapter connects to." - type: string - default: "snowflake" - required: true - workflow_call: - inputs: - version_number: - description: "The release version number (i.e. 1.0.0b1)" + ref: + description: "The ref (sha or branch name) to use" type: string + default: "main" required: true - sha: - description: "The sha to use (leave empty to use latest on main)" - type: string - required: false package_test_command: description: "Package test command" type: string default: "python -c \"import dbt.adapters.snowflake\"" required: true - dbms_name: - description: "The name of the warehouse the adapter connects to." - type: string - default: "snowflake" - required: true defaults: run: shell: bash -env: - PYTHON_TARGET_VERSION: 3.11 - jobs: invoke-reusable-workflow: - name: Build and Release Internally + name: "Build and Release Internally" - uses: VersusFacit/dbt-release/.github/workflows/internal-archive-release.yml@main + uses: "dbt-labs/dbt-release/.github/workflows/internal-archive-release.yml@main" with: - version_number: ${{ inputs.version_number }} - package_test_command: ${{ inputs.package_test_command }} - dbms_name: ${{ inputs.dbms_name }} - sha: ${{ inputs.sha }} + version_number: "${{ inputs.version_number }}" + package_test_command: "${{ inputs.package_test_command }}" + dbms_name: "snowflake" + ref: "${{ inputs.ref }}" - secrets: inherit + secrets: "inherit" diff --git a/setup.py b/setup.py index 625876e26..9cfe8c32a 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,8 @@ def _get_plugin_version_dict(): _semver = r"""(?P\d+)\.(?P\d+)\.(?P\d+)""" _pre = r"""((?Pa|b|rc)(?P
\d+))?"""
     _nightly = r"""(\.(?P[a-z0-9]+)?)?"""
-    _version_pattern = rf"""version\s*=\s*["']{_semver}{_pre}{_nightly}["']"""
+    _build = r"""(\+build[0-9]+)?"""
+    _version_pattern = rf"""version\s*=\s*["']{_semver}{_pre}{_nightly}{_build}["']"""
     with open(_version_path) as f:
         match = re.search(_version_pattern, f.read().strip())
         if match is None: