Various field name changes, add dbt-common

dbt-labs · Jul 29, 2024 · 3d4e1ff · 3d4e1ff
1 parent faf3dd1
commit 3d4e1ff
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/.github/scripts/update_dev_dependency_branches.sh b/.github/scripts/update_dev_dependency_branches.sh
@@ -2,16 +2,20 @@
 set -e
 
 
-adapters_git_branch=$1
-core_git_branch=$2
+dbt_adapters_git_branch=$1
+dbt_core_git_branch=$2
+dbt_common_git_branch=$3
 target_req_file="pyproject.toml"
-core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${core_git_branch}#subdirectory=core|g"
-adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${adapters_git_branch}|g"
+core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${dbt_core_git_branch}#subdirectory=core|g"
+adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${dbt_adapters_git_branch}|g"
+common_req_sed_pattern="s|dbt-common.git|dbt-common.git@${dbt_common_git_branch}|g"
 if [[ "$OSTYPE" == darwin* ]]; then
  # mac ships with a different version of sed that requires a delimiter arg
- sed -i "" "$core_req_sed_pattern" $target_req_file
  sed -i "" "$adapters_req_sed_pattern" $target_req_file
+ sed -i "" "$core_req_sed_pattern" $target_req_file
+ sed -i "" "$common_req_sed_pattern" $target_req_file
 else
- sed -i "$core_req_sed_pattern" $target_req_file
  sed -i "$adapters_req_sed_pattern" $target_req_file
+ sed -i "$core_req_sed_pattern" $target_req_file
+ sed -i "$common_req_sed_pattern" $target_req_file
 fi
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -10,6 +10,16 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
+      name:
+        description: "Name to associate with run, for example 'dbt-adapters-242'"
+        required: false
+        type: string
+        default: "Adapter Integration Tests"
+      adapter_branch:
+        description: "The branch in this adapter repository to use"
+        type: string
+        required: false
+        default: "main"
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to use"
         type: string
@@ -20,16 +30,11 @@ on:
         type: string
         required: false
         default: "main"
-      name:
-        description: "name to associate with run"
-        required: false
-        type: string
-        default: "Adapter Integration Tests"
-      adapter_branch:
-        description: "The branch of this adapter repository to use"
+     dbt_common_branch:
+        description: "The branch of dbt-common to use"
         type: string
         required: false
-        default: main
+        default: "main"
   workflow_call:
     inputs:
       dbt_adapters_branch:
@@ -103,7 +108,8 @@ jobs:
         run: |
           ./.github/scripts/update_dev_dependency_branches.sh \
             ${{ inputs.dbt_adapters_branch }} \
-            ${{ inputs.dbt_core_branch }}
+            ${{ inputs.dbt_core_branch }} \
+            ${{ inputs.dbt_common_branch }}
           cat pyproject.toml 
 
       - name: Setup postgres