fix version things for publishing

dbt-labs · Dec 7, 2024 · 1d36766 · 1d36766
1 parent 8782e47
commit 1d36766
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/_package-directory.yml b/.github/workflows/_package-directory.yml
@@ -1,7 +1,6 @@
 name: "Package directory"
 
 on:
-    pull_request:
     workflow_call:
         inputs:
             package:
@@ -12,6 +11,9 @@ on:
             directory:
                 description: "The root directory of the package"
                 value: ${{ jobs.package.outputs.directory }}
+            version-file:
+                description: "The path to the version file of the package"
+                value: ${{ jobs.package.outputs.version-file }}
 
 defaults:
     run:
@@ -22,13 +24,17 @@ jobs:
         runs-on: ${{ vars.DEFAULT_RUNNER }}
         outputs:
             directory: ${{ steps.package.outputs.directory }}
+            version-file: ${{ steps.package.outputs.version-file }}
         steps:
         -   id: package
             run: |
                 if [[ ${{ inputs.package }} == "dbt-adapters" ]]
                 then
                     directory=""
+                    version_file="./dbt/adapters/__about__.py"
                 else
                     directory="${{ inputs.package }}/"
+                    version_file="./src/dbt/adapters/$(cut -c 5- ${{ inputs.package }})/__version__.py"
                 fi
                 echo "directory=$directory" >> $GITHUB_OUTPUT
+                echo "version-file=version_file" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/_publish-internal.yml b/.github/workflows/_publish-internal.yml
@@ -1,7 +1,6 @@
 name: "Publish internally"
 
 on:
-    pull_request:
     workflow_call:
         inputs:
             package:
@@ -82,7 +81,7 @@ jobs:
                 versions_published: ${{ steps.published.outputs.versions }}
         -   run: |
                 VERSION=${{ steps.next.outputs.internal_release_version }}+$(git rev-parse HEAD)
-                tee <<< "version = \"$VERSION\"" ./src/dbt/adapters/athena/__version__.py
+                tee <<< "version = \"$VERSION\"" ${{ needs.package.outputs.version-file }}
             working-directory: ./${{ needs.package.outputs.directory }}
         -   run: sed -i "/dbt-core[<>~=]/d" ./pyproject.toml
             working-directory: ./${{ needs.package.outputs.directory }}

diff --git a/.github/workflows/_publish-pypi.yml b/.github/workflows/_publish-pypi.yml
@@ -1,7 +1,6 @@
 name: "Publish to PyPI"
 
 on:
-    pull_request:
     workflow_call:
         inputs:
             package:
@@ -69,7 +68,7 @@ jobs:
         -   uses: pypa/gh-action-pypi-publish@release/v1
             with:
                 repository-url: ${{ vars.PYPI_REPOSITORY_URL }}
-                packages-dir: ${{ inputs.package }}/dist/
+                packages-dir: ./${{ needs.package.outputs.directory }}dist/
 
     verify:
         runs-on: ${{ vars.DEFAULT_RUNNER }}

diff --git a/pyproject.toml b/pyproject.toml
@@ -66,6 +66,8 @@ code-quality = "pre-commit run --all-files"
 unit-tests = "python -m pytest {args:tests/unit}"
 workflow-code-quality = "gh workflow run _code-quality.yml --ref $(git rev-parse --abbrev-ref HEAD) -f branch=$(git rev-parse --abbrev-ref HEAD)"
 workflow-generate-changelog = "gh workflow run _generate-changelog.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f merge=false -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-publish-internal = "gh workflow run _publish-internal.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f deploy-to=test -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-publish-pypi = "gh workflow run _publish-pypi.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f deploy-to=test -f branch=$(git rev-parse --abbrev-ref HEAD)"
 workflow-unit-tests = "gh workflow run _unit-tests.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
 workflow-verify-build = "gh workflow run _verify-build.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
 workflow-publish = "gh workflow run publish.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD) -f deploy-to=test -f pypi-internal=false -f pypi-public=true"