From a61ac4a2488570b75e46b3350b43e6536f4b91d8 Mon Sep 17 00:00:00 2001 From: Laura Li Foa Wing Date: Thu, 31 Oct 2024 09:26:34 -0700 Subject: [PATCH] Adjust GHA formatting --- .github/workflows/ci_test_package.yml | 120 +++++++++++++------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index dac5e014..dcc32ee1 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -202,36 +202,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,35 +244,31 @@ 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 }}