From 9e6b1262ac5fe83cd799451be09ee2bb9510af34 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Mon, 4 Nov 2024 14:53:56 -0800 Subject: [PATCH 01/13] increment version --- README.md | 2 +- dbt_project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa3f6ef0..2a575c78 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ See the generated [dbt docs site](https://brooklyn-data.github.io/dbt_artifacts/ ``` packages: - package: brooklyn-data/dbt_artifacts - version: 2.7.0 + version: 2.7.1 ``` :construction_worker: Make sure to fix at least the **minor** version, to avoid issues when a new release is open. See the notes on upgrading below for more detail. diff --git a/dbt_project.yml b/dbt_project.yml index a02ad65a..9cba8340 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: "dbt_artifacts" -version: "2.7.0" +version: "2.7.1" config-version: 2 require-dbt-version: [">=1.3.0", "<1.9.0"] profile: "dbt_artifacts" From 0fb2d1250ecfe18c352a2433eb55507c38accef0 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:08:51 -0800 Subject: [PATCH 02/13] fixing run block indentation --- .github/workflows/ci_test_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index b714dfde..dcc32ee1 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -271,4 +271,4 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From ab2997cff4d8554413232ea54304ccb605fb95a9 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:12:11 -0800 Subject: [PATCH 03/13] fix other indentation --- .github/workflows/ci_test_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index dcc32ee1..8609e0ca 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -90,7 +90,7 @@ jobs: - name: Build tables for latest release env: DBT_VERSION: "noversion" - run: tox -e integration_${{ matrix.warehouse }} + run: tox -e integration_${{ matrix.warehouse }} - name: Checkout uses: actions/checkout@v3 @@ -167,7 +167,7 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} + run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning # integration-databricks: @@ -231,7 +231,7 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver + run: tox -e integration_sqlserver integration-sqlserver-single-run: strategy: From 8aeaa108af818955fcf726c4a8384577aef236f0 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:18:25 -0800 Subject: [PATCH 04/13] trying same indentation as #450 --- .github/workflows/ci_test_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 8609e0ca..dcc32ee1 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -90,7 +90,7 @@ jobs: - name: Build tables for latest release env: DBT_VERSION: "noversion" - run: tox -e integration_${{ matrix.warehouse }} + run: tox -e integration_${{ matrix.warehouse }} - name: Checkout uses: actions/checkout@v3 @@ -167,7 +167,7 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} + run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning # integration-databricks: @@ -231,7 +231,7 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver + run: tox -e integration_sqlserver integration-sqlserver-single-run: strategy: From 4434a6524c2568906e81308a22775de3c0506b8a Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:25:17 -0800 Subject: [PATCH 05/13] reverting to #450 --- .github/workflows/ci_test_package.yml | 143 +++++++++++--------------- 1 file changed, 61 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index dcc32ee1..9e61fddb 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -44,7 +44,6 @@ jobs: permissions: contents: "read" id-token: "write" - services: postgres: image: postgres @@ -57,7 +56,6 @@ jobs: --health-retries 5 ports: - 5432:5432 - steps: - name: Get latest release uses: rez0n/actions-github-release@main @@ -66,37 +64,30 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} type: "stable" - - name: Checkout latest release uses: actions/checkout@v3 with: ref: ${{ steps.latest_release.outputs.release }} - - uses: actions/setup-python@v4 with: python-version: "3.8.x" architecture: "x64" - - name: Install tox run: python3 -m pip install tox - - id: auth-on-release if: ${{ matrix.warehouse == 'bigquery' }} uses: google-github-actions/auth@v1 with: workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }} service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} - - name: Build tables for latest release env: DBT_VERSION: "noversion" run: tox -e integration_${{ matrix.warehouse }} - - name: Checkout uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - # Need to get the auth file again - id: auth-on-pr if: ${{ matrix.warehouse == 'bigquery' }} @@ -104,10 +95,8 @@ jobs: with: workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }} service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} - - name: Run Tests on PR run: tox -e integration_${{ matrix.warehouse }}_${{ env.LAST_RELEASE_SUPPORTED_DBT_VERSION }} - single-run-different-versions: needs: integration strategy: @@ -122,7 +111,6 @@ jobs: permissions: contents: "read" id-token: "write" - services: postgres: image: postgres @@ -135,27 +123,21 @@ jobs: --health-retries 5 ports: - 5432:5432 - steps: - uses: actions/setup-python@v4 with: python-version: "3.8.x" architecture: "x64" - - name: Install tox run: python3 -m pip install tox - - name: Install SQL Server run: docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=123" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2022-latest - - name: Install Microsoft ODBC run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - # Need to get the auth file again - id: auth-on-pr if: ${{ matrix.warehouse == 'bigquery' }} @@ -163,32 +145,26 @@ jobs: with: workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }} service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }} - - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} - # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning # integration-databricks: # runs-on: ubuntu-latest # environment: # name: Approve Integration Tests - # steps: # - name: Checkout # uses: actions/checkout@v3 # with: # ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - # - uses: actions/setup-python@v4 # with: # python-version: '3.8.x' # architecture: 'x64' - # - name: Install tox # run: python3 -m pip install tox - # - name: Run Databricks Tests # env: # DBT_VERSION: '' @@ -202,36 +178,36 @@ jobs: name: Approve Integration Tests steps: - - uses: actions/setup-python@v4 - with: - python-version: "3.8.x" - architecture: "x64" - - name: Install SQL Server - uses: Particular/install-sql-server-action@v1.2.0 - with: - connection-string-env-var: SQL_SERVER_CONNECTION_STRING - catalog: dbt_artifact_integrationtests - - name: Create DBT User - shell: pwsh - run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - - name: Install tox - run: python3 -m pip install tox - - - name: Install Microsoft ODBC - run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - - name: Run Tests on PR - env: - DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver + - uses: actions/setup-python@v4 + with: + python-version: "3.8.x" + architecture: "x64" + - name: Install SQL Server + uses: Particular/install-sql-server-action@v1.2.0 + with: + connection-string-env-var: SQL_SERVER_CONNECTION_STRING + catalog: dbt_artifact_integrationtests + - name: Create DBT User + shell: pwsh + run: | + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + - name: Install tox + run: python3 -m pip install tox + + - name: Install Microsoft ODBC + run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y + + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + + - name: Run Tests on PR + env: + DBT_VERSION: ${{ matrix.version }} + run: tox -e integration_sqlserver integration-sqlserver-single-run: strategy: @@ -244,31 +220,34 @@ jobs: environment: name: Approve Integration Tests - steps: - - uses: actions/setup-python@v4 - with: - python-version: "3.8.x" - architecture: "x64" - - name: Install SQL Server - uses: Particular/install-sql-server-action@v1.2.0 - with: - connection-string-env-var: SQL_SERVER_CONNECTION_STRING - catalog: dbt_artifact_integrationtests - - name: Create DBT User - shell: pwsh - run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - - name: Install tox - run: python3 -m pip install tox - - name: Install Microsoft ODBC - run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - name: Run Tests on PR - env: - DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + steps: + - uses: actions/setup-python@v4 + with: + python-version: "3.8.x" + architecture: "x64" + - name: Install SQL Server + uses: Particular/install-sql-server-action@v1.2.0 + with: + connection-string-env-var: SQL_SERVER_CONNECTION_STRING + catalog: dbt_artifact_integrationtests + - name: Create DBT User + shell: pwsh + run: | + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + - name: Install tox + run: python3 -m pip install tox + + - name: Install Microsoft ODBC + run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y + + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + + - name: Run Tests on PR + env: + DBT_VERSION: ${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From 28c3bddb7d91c0a8e3485aa8d5b7300423d4e8ab Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:27:02 -0800 Subject: [PATCH 06/13] fixing single run sql-server --- .github/workflows/ci_test_package.yml | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 9e61fddb..f0a1cbf1 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -221,33 +221,33 @@ jobs: name: Approve Integration Tests steps: - - uses: actions/setup-python@v4 - with: - python-version: "3.8.x" - architecture: "x64" - - name: Install SQL Server - uses: Particular/install-sql-server-action@v1.2.0 - with: - connection-string-env-var: SQL_SERVER_CONNECTION_STRING - catalog: dbt_artifact_integrationtests - - name: Create DBT User - shell: pwsh - run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - - name: Install tox - run: python3 -m pip install tox + - uses: actions/setup-python@v4 + with: + python-version: "3.8.x" + architecture: "x64" + - name: Install SQL Server + uses: Particular/install-sql-server-action@v1.2.0 + with: + connection-string-env-var: SQL_SERVER_CONNECTION_STRING + catalog: dbt_artifact_integrationtests + - name: Create DBT User + shell: pwsh + run: | + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + - name: Install tox + run: python3 -m pip install tox - - name: Install Microsoft ODBC - run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y + - name: Install Microsoft ODBC + run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - name: Run Tests on PR - env: - DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + - name: Run Tests on PR + env: + DBT_VERSION: ${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From 6f05045761b77c6689cc5b5f085dda4facc92f5b Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:34:38 -0800 Subject: [PATCH 07/13] fixing for faulty block --- .github/workflows/ci_test_package.yml | 62 +++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index f0a1cbf1..3d286209 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -216,38 +216,38 @@ jobs: # When supporting a new version, update the list here version: ["1_3_0", "1_4_0", "1_7_0", "1_8_0"] run: tox -e integration_sqlserver_${{ matrix.version }} - runs-on: ubuntu-latest - environment: - name: Approve Integration Tests + runs-on: ubuntu-latest + environment: + name: Approve Integration Tests - steps: - - uses: actions/setup-python@v4 - with: - python-version: "3.8.x" - architecture: "x64" - - name: Install SQL Server - uses: Particular/install-sql-server-action@v1.2.0 - with: - connection-string-env-var: SQL_SERVER_CONNECTION_STRING - catalog: dbt_artifact_integrationtests - - name: Create DBT User - shell: pwsh - run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - - name: Install tox - run: python3 -m pip install tox + steps: + - uses: actions/setup-python@v4 + with: + python-version: "3.8.x" + architecture: "x64" + - name: Install SQL Server + uses: Particular/install-sql-server-action@v1.2.0 + with: + connection-string-env-var: SQL_SERVER_CONNECTION_STRING + catalog: dbt_artifact_integrationtests + - name: Create DBT User + shell: pwsh + run: | + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + - name: Install tox + run: python3 -m pip install tox - - name: Install Microsoft ODBC - run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y + - name: Install Microsoft ODBC + run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - name: Run Tests on PR - env: - DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + - name: Run Tests on PR + env: + DBT_VERSION: ${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From e3aaa80e9f1426762dc6b67d436a074fcf501396 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:39:25 -0800 Subject: [PATCH 08/13] fixing middle block --- .github/workflows/ci_test_package.yml | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 3d286209..1cf198ca 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -178,36 +178,36 @@ jobs: name: Approve Integration Tests steps: - - uses: actions/setup-python@v4 - with: - python-version: "3.8.x" - architecture: "x64" - - name: Install SQL Server - uses: Particular/install-sql-server-action@v1.2.0 - with: - connection-string-env-var: SQL_SERVER_CONNECTION_STRING - catalog: dbt_artifact_integrationtests - - name: Create DBT User - shell: pwsh - run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - - name: Install tox - run: python3 -m pip install tox + - uses: actions/setup-python@v4 + with: + python-version: "3.8.x" + architecture: "x64" + - name: Install SQL Server + uses: Particular/install-sql-server-action@v1.2.0 + with: + connection-string-env-var: SQL_SERVER_CONNECTION_STRING + catalog: dbt_artifact_integrationtests + - name: Create DBT User + shell: pwsh + run: | + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + - name: Install tox + run: python3 -m pip install tox - - name: Install Microsoft ODBC - run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y + - name: Install Microsoft ODBC + run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - name: Run Tests on PR - env: - DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver + - name: Run Tests on PR + env: + DBT_VERSION: ${{ matrix.version }} + run: tox -e integration_sqlserver integration-sqlserver-single-run: strategy: @@ -250,4 +250,4 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From b21dc9891b85131bbf430606855f7106f515f896 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:47:56 -0800 Subject: [PATCH 09/13] found faulty line --- .github/workflows/ci_test_package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 1cf198ca..b7a21dd6 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -215,7 +215,6 @@ jobs: matrix: # When supporting a new version, update the list here version: ["1_3_0", "1_4_0", "1_7_0", "1_8_0"] - run: tox -e integration_sqlserver_${{ matrix.version }} runs-on: ubuntu-latest environment: name: Approve Integration Tests From dfc75e2da70bb09984d3dbb0f024dcfc937999e4 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 09:51:55 -0800 Subject: [PATCH 10/13] last fix --- .github/workflows/ci_test_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index b7a21dd6..7aa49bf9 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -249,4 +249,4 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From e178d9bd96d8475f0a67154e2f790eea64ad8dc3 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 10:09:27 -0800 Subject: [PATCH 11/13] trying a chatgpt fix --- .github/workflows/ci_test_package.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 7aa49bf9..63f895a5 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -173,6 +173,8 @@ jobs: integration-sqlserver: strategy: fail-fast: false # Don't fail one DWH if the others fail + matrix: + version: ["1_3_0", "1_4_0", "1_7_0", "1_8_0"] runs-on: ubuntu-latest environment: name: Approve Integration Tests @@ -207,13 +209,12 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver + run: tox -e integration_sqlserver_${{ matrix.version }} integration-sqlserver-single-run: strategy: - fail-fast: false # Don't fail one DWH if the others fail + fail-fast: false # Don't fail one DWH if the others fail matrix: - # When supporting a new version, update the list here version: ["1_3_0", "1_4_0", "1_7_0", "1_8_0"] runs-on: ubuntu-latest environment: @@ -232,21 +233,18 @@ jobs: - name: Create DBT User shell: pwsh run: | - echo "Create dbt login with sysadmin" - sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" - sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" + echo "Create dbt login with sysadmin" + sqlcmd -Q "CREATE LOGIN dbt WITH PASSWORD = '123', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF" -d "dbt_artifact_integrationtests" + sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER dbt" -d "dbt_artifact_integrationtests" - name: Install tox run: python3 -m pip install tox - - name: Install Microsoft ODBC run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y - - name: Checkout uses: actions/checkout@v3 with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: tox -e integration_sqlserver_${{ matrix.version }} From 167e9adf8b2fecda813609409531bf3dab5eafe5 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 10:12:15 -0800 Subject: [PATCH 12/13] pls --- .github/workflows/ci_test_package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 63f895a5..e59e4ba6 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -247,4 +247,6 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: | + echo "Running tests for DBT version: ${{ matrix.version }}" + tox -e integration_sqlserver_${{ matrix.version }} From 62eec3d0c6c2fa0a9f88b2860d0bbb9210288c69 Mon Sep 17 00:00:00 2001 From: Michelle Yan Date: Tue, 5 Nov 2024 10:14:41 -0800 Subject: [PATCH 13/13] ok --- .github/workflows/ci_test_package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index e59e4ba6..fe27cd14 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -209,7 +209,9 @@ jobs: - name: Run Tests on PR env: DBT_VERSION: ${{ matrix.version }} - run: tox -e integration_sqlserver_${{ matrix.version }} + run: | + echo "Running tests for DBT version: ${{ matrix.version }}" + tox -e integration_sqlserver_${{ matrix.version }} integration-sqlserver-single-run: strategy: @@ -249,4 +251,4 @@ jobs: DBT_VERSION: ${{ matrix.version }} run: | echo "Running tests for DBT version: ${{ matrix.version }}" - tox -e integration_sqlserver_${{ matrix.version }} + tox -e integration-sqlserver-single-run_${{ matrix.version }}