using string interpoloation to gather correct pointer for dbt-core te… (

dbt-labs#80) * Merge `main` into `1.0.latest` (dbt-labs#46) * Slack message for failed nightly runs (dbt-labs#41) * Add Redshift parameter to create tables with backup option specified (dbt-labs#42) * Update impl and adapters to support backup parameter * Add test files * Add test files * Add PR link to Changelog * Add EOF newlines * Debug and split test into two separate cases * Add contributor info Co-authored-by: Jeremy Cohen <[email protected]> * Bumping version to 1.0.0rc2 (dbt-labs#45) * Bumping version to 1.0.0rc2 * Update changelog Co-authored-by: Github Build Bot <[email protected]> Co-authored-by: Jeremy Cohen <[email protected]> Co-authored-by: Dan Bryan <[email protected]> Co-authored-by: Jeremy Cohen <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Build Bot <[email protected]> * [Backport] Bumping version to 1.0.0 (dbt-labs#47) (dbt-labs#48) * Bumping version to 1.0.0 (dbt-labs#47) Co-authored-by: Github Build Bot <[email protected]> * Update CHANGELOG.md Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Build Bot <[email protected]> * Fix package version (dbt-labs#49) * using string interpoloation to gather correct pointer for dbt-core tests against release branches * created new job for gha to grab correct version of dbt-core to test branch against * minor update * adding Get dbt-core-version step to integration.yaml * modifying version parameters * change for integration testing * updating file * readding pull_request_target now that tests pass * make nit: suggested changes * testing conditional logic in integration.yml * updating test names * creating main.yml versions of new condtional steps for dbt-version gather * trying different version of test v.2 * v.3 of conditional mix of original version of tests and leah logic * adding comment and changelog entry * changes made after review by @VersusFacit and @kwigley * name change * minor updates * updating name of version ref * name change of dbt-version step to dbt-core-ref to be more descriptive iof where version is coming from * Update test_backup_table_option.py * Update test_backup_table_option.py * reseting file that shouldn't of been changed Co-authored-by: leahwicz <[email protected]> Co-authored-by: Dan Bryan <[email protected]> Co-authored-by: Jeremy Cohen <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Build Bot <[email protected]>
abbywh · Mar 21, 2022 · 7d87ecb · 7d87ecb
1 parent 81a4986
commit 7d87ecb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -151,21 +151,24 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-
+      - name: Get dbt-core version
+        # if this is a pull request uses ref of base branch otherwise uses ref of current commit
+        id: dbt-core-version
+        run: echo "::set-output name=dbt-core-ref::${{ github.event_name == 'pull_request_target' && github.base_ref || github.ref }}"
       - name: Install python dependencies
         run: |
           pip install  --user --upgrade pip
           pip install tox
           pip --version
           tox --version
 
-      - name: Install dbt-core latest
+      - name: Install dbt-core from branch ${{ steps.dbt-core-version.outputs.dbt-core-ref }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-core-ref }}#egg=dbt-core&subdirectory=core"
 
-      - name: Install dbt-postgres latest
+      - name: Install dbt-postgres from ${{ steps.dbt-core-version.outputs.dbt-core-ref }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-core-ref }}#egg=dbt-postgres&subdirectory=plugins/postgres"
 
       - name: Run tox (redshift)
         if: matrix.adapter == 'redshift'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -93,21 +93,24 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-
+      - name: Get dbt-core version
+        # if this is a pull request uses ref of base branch otherwise uses ref of current commit
+        id: dbt-core-version
+        run: echo "::set-output name=dbt-core-ref::${{ github.event_name == 'pull_request' && github.base_ref || github.ref }}"
       - name: Install python dependencies
         run: |
           pip install  --user --upgrade pip
           pip install tox
           pip --version
           tox --version
 
-      - name: Install dbt-core latest
+      - name: Install dbt-core from branch ${{ steps.dbt-core-version.outputs.dbt-core-ref }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-core-ref }}#egg=dbt-core&subdirectory=core"
 
-      - name: Install dbt-postgres latest
+      - name: Install dbt-postgres from ${{ steps.dbt-core-version.outputs.dbt-core-ref }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-core-ref }}#egg=dbt-postgres&subdirectory=plugins/postgres"
 
       - name: Run tox
         run: tox

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - Fix table creation statement ordering when including both the BACKUP parameter as well as the dist/sort keys ([#23](https://github.com/dbt-labs/dbt-redshift/issues/60))
 - Add unique\_id field to docs generation test catalogs; a follow-on PR to core PR ([#4168](https://github.com/dbt-labs/dbt-core/pull/4618)) and core PR ([#4701](https://github.com/dbt-labs/dbt-core/pull/4701))
 
+### Under the hood
+- install compatible branch of dbt-core in unit/integration tests based on merge target ([#80](https://github.com/dbt-labs/dbt-redshift/pull/80))
+
 ## dbt-redshift 1.0.0 (December 3, 2021)
 
 ## dbt-redshift 1.0.0rc2 (November 24, 2021)