change order of args in script

dbt-labs · Feb 14, 2024 · 212441a · 212441a
1 parent a385fb1
commit 212441a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/scripts/update_dev_packages.sh b/.github/scripts/update_dev_packages.sh
@@ -1,8 +1,9 @@
 #!/bin/bash -e
 set -e
 
-core_git_branch=$1
-adapters_git_branch=$2
+
+adapters_git_branch=$1
+core_git_branch=$2
 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"

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -45,11 +45,11 @@ jobs:
         shell: bash
         run: |
           ./.github/scripts/update_dev_packages.sh \
-            "main" \
-            ${{ github.event.inputs.dbt_adapters_branch }}
+            ${{ github.event.inputs.dbt_adapters_branch }} \
+            "main"
 
       - name: Setup `hatch`
-        uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main
+        uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@${{ inputs.dbt_adapters_branch }}
 
       - name: Run linters
         run: hatch run lint:all

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -11,24 +11,24 @@ on:
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to use"
         type: string
-        required: true
+        required: false
         default: "main"
       core_branch:
         description: "The branch of dbt-core to use"
         type: string
-        required: true
+        required: false
         default: "main"
   workflow_call:
     inputs:
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to use"
         type: string
-        required: true
+        required: false
         default: "main"
       core_branch:
         description: "The branch of dbt-core to use"
         type: string
-        required: true
+        required: false
         default: "main"
 
 
@@ -71,8 +71,8 @@ jobs:
         shell: bash
         run: |
           ./.github/scripts/update_dev_packages.sh \
-            ${{ github.event.inputs.core_branch }} \
-            ${{ github.event.inputs.dbt_adapters_branch }}
+            ${{ github.event.inputs.dbt_adapters_branch }} \
+            ${{ github.event.inputs.core_branch }}
 
       - name: Setup postgres
         shell: bash