Skip to content

Commit 550521e

Browse files
authored
Integration workflow update to support all-in-one adapter testing (#133)
1 parent 2854173 commit 550521e

File tree

2 files changed

+55
-10
lines changed

2 files changed

+55
-10
lines changed

.github/scripts/update_dev_packages.sh renamed to .github/scripts/update_dev_dependency_branches.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
set -e
33

44

5-
adapters_git_branch=$1
6-
core_git_branch=$2
5+
dbt_adapters_branch=$1
6+
dbt_core_branch=$2
7+
dbt_common_branch=$3
78
target_req_file="pyproject.toml"
8-
core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${core_git_branch}#subdirectory=core|g"
9-
adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${adapters_git_branch}|g"
9+
core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${dbt_core_branch}#subdirectory=core|g"
10+
adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${dbt_adapters_branch}|g"
11+
common_req_sed_pattern="s|dbt-common.git|dbt-common.git@${dbt_common_branch}|g"
1012
if [[ "$OSTYPE" == darwin* ]]; then
1113
# mac ships with a different version of sed that requires a delimiter arg
12-
sed -i "" "$core_req_sed_pattern" $target_req_file
1314
sed -i "" "$adapters_req_sed_pattern" $target_req_file
15+
sed -i "" "$core_req_sed_pattern" $target_req_file
16+
sed -i "" "$common_req_sed_pattern" $target_req_file
1417
else
15-
sed -i "$core_req_sed_pattern" $target_req_file
1618
sed -i "$adapters_req_sed_pattern" $target_req_file
19+
sed -i "$core_req_sed_pattern" $target_req_file
20+
sed -i "$common_req_sed_pattern" $target_req_file
1721
fi

.github/workflows/integration-tests.yml

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Integration Tests
22

3+
run-name: "${{ (contains(github.event_name, 'workflow_') && inputs.name) || github.event_name }}: ${{ (contains(github.event_name, 'workflow_') && inputs.adapter_branch) || github.ref_name }} by @${{ github.actor }}"
4+
35
on:
46
push:
57
branches:
@@ -8,28 +10,58 @@ on:
810
pull_request:
911
workflow_dispatch:
1012
inputs:
13+
name:
14+
description: "Name to associate with run (example: 'dbt-adapters-242')"
15+
required: false
16+
type: string
17+
default: "Adapter Integration Tests"
18+
adapter_branch:
19+
description: "The branch of this adapter repository to use"
20+
type: string
21+
required: false
22+
default: "main"
1123
dbt_adapters_branch:
1224
description: "The branch of dbt-adapters to use"
1325
type: string
1426
required: false
1527
default: "main"
16-
core_branch:
28+
dbt_core_branch:
1729
description: "The branch of dbt-core to use"
1830
type: string
1931
required: false
2032
default: "main"
33+
dbt_common_branch:
34+
description: "The branch of dbt-common to use"
35+
type: string
36+
required: false
37+
default: "main"
2138
workflow_call:
2239
inputs:
40+
name:
41+
description: "name to associate with run"
42+
required: false
43+
type: string
44+
default: "Adapter Integration Tests"
45+
adapter_branch:
46+
description: "The branch of this adapter repository to use"
47+
type: string
48+
required: false
49+
default: "main"
2350
dbt_adapters_branch:
2451
description: "The branch of dbt-adapters to use"
2552
type: string
2653
required: false
2754
default: "main"
28-
core_branch:
55+
dbt_core_branch:
2956
description: "The branch of dbt-core to use"
3057
type: string
3158
required: false
3259
default: "main"
60+
dbt_common_branch:
61+
description: "The branch of dbt-common to use"
62+
type: string
63+
required: false
64+
default: "main"
3365

3466
permissions: read-all
3567

@@ -67,14 +99,23 @@ jobs:
6799

68100
steps:
69101
- name: Check out repository
102+
if: ${{ github.event_name == 'pull_request'|| github.event_name == 'push' }}
70103
uses: actions/checkout@v4
71104

105+
- name: Check out the repository (workflow_dispatch)
106+
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' }}
107+
uses: actions/checkout@v4
108+
with:
109+
ref: ${{ inputs.adapter_branch }}
110+
72111
- name: Update Adapters and Core branches
73112
if: ${{ github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch'}}
74113
run: |
75-
./.github/scripts/update_dev_packages.sh \
114+
./.github/scripts/update_dev_dependency_branches.sh \
76115
${{ inputs.dbt_adapters_branch }} \
77-
${{ inputs.core_branch }}
116+
${{ inputs.dbt_core_branch }} \
117+
${{ inputs.dbt_common_branch }}
118+
cat pyproject.toml
78119
79120
- name: Setup postgres
80121
run: psql -f ./scripts/setup_test_database.sql

0 commit comments

Comments
 (0)