From e330420d9128f12effed87ec4f9b8d5fcf9ac30c Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 14:41:24 +0100 Subject: [PATCH 1/7] Add windows_latest to Github workflow matrix OS --- .github/workflows/ci_test_package.yml | 4 ++-- .github/workflows/main_test_package.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 34c47163..8c130797 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false # Don't fail one DWH if the others fail matrix: warehouse: ["snowflake", "bigquery"] - runs-on: ubuntu-latest + os: [ubuntu-latest, windows-latest] environment: name: Approve Integration Tests permissions: @@ -103,7 +103,7 @@ jobs: warehouse: ["snowflake", "bigquery"] # When supporting a new version, update the list here version: ["1_3_0", "1_4_0", "1_5_0"] - runs-on: ubuntu-latest + os: [ubuntu-latest, windows-latest] environment: name: Approve Integration Tests permissions: diff --git a/.github/workflows/main_test_package.yml b/.github/workflows/main_test_package.yml index 2202c05c..56ec795b 100644 --- a/.github/workflows/main_test_package.yml +++ b/.github/workflows/main_test_package.yml @@ -36,7 +36,8 @@ jobs: matrix: warehouse: ["snowflake", "bigquery"] version: ["1_3_0", "1_4_0", "1_5_0"] - runs-on: ubuntu-latest + os: [ubuntu-latest, windows-latest] + permissions: contents: "read" id-token: "write" From 9663a946b8608d2062dc6ac023a9190843719f86 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 14:44:55 +0100 Subject: [PATCH 2/7] Add missing runs_on and use matrix.os --- .github/workflows/ci_test_package.yml | 2 ++ .github/workflows/main_test_package.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 8c130797..3ab0a89c 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -39,6 +39,7 @@ jobs: matrix: warehouse: ["snowflake", "bigquery"] os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} environment: name: Approve Integration Tests permissions: @@ -104,6 +105,7 @@ jobs: # When supporting a new version, update the list here version: ["1_3_0", "1_4_0", "1_5_0"] os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} environment: name: Approve Integration Tests permissions: diff --git a/.github/workflows/main_test_package.yml b/.github/workflows/main_test_package.yml index 56ec795b..12029980 100644 --- a/.github/workflows/main_test_package.yml +++ b/.github/workflows/main_test_package.yml @@ -37,7 +37,7 @@ jobs: warehouse: ["snowflake", "bigquery"] version: ["1_3_0", "1_4_0", "1_5_0"] os: [ubuntu-latest, windows-latest] - + runs-on: ${{ matrix.os }} permissions: contents: "read" id-token: "write" From de6d4a059215cd527c71a0841bc6849e6bed61b6 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 14:59:27 +0100 Subject: [PATCH 3/7] Refactor get latest release step --- .github/workflows/ci_test_package.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 3ab0a89c..b5929bb9 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -48,12 +48,10 @@ jobs: steps: - name: Get latest release - uses: rez0n/actions-github-release@main id: latest_release - env: - token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - type: "stable" + run: | + output=$(git describe --tags --abbrev=0) + echo "::set-output name=release::$output" - name: Checkout latest release uses: actions/checkout@v3 From 84f7900fc03177e1fdfc5a92b76ccb56fbe600c1 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 15:02:46 +0100 Subject: [PATCH 4/7] Add a checkout step before getting the release --- .github/workflows/ci_test_package.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index b5929bb9..020f0839 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -47,6 +47,11 @@ jobs: id-token: "write" steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: main + - name: Get latest release id: latest_release run: | From ace9ec4050903fe0835358dc75bc8717f01f6955 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 15:07:40 +0100 Subject: [PATCH 5/7] Add run object to checkout --- .github/workflows/ci_test_package.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 020f0839..b1fce790 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -48,13 +48,11 @@ jobs: steps: - name: Checkout + id: latest_release uses: actions/checkout@v3 with: path: main - - - name: Get latest release - id: latest_release - run: | + - run: | output=$(git describe --tags --abbrev=0) echo "::set-output name=release::$output" From b2b5c27cd95ccbbe465874f71f95cd4776a30d64 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 15:12:51 +0100 Subject: [PATCH 6/7] Remove with settings --- .github/workflows/ci_test_package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index b1fce790..7451a390 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -50,8 +50,6 @@ jobs: - name: Checkout id: latest_release uses: actions/checkout@v3 - with: - path: main - run: | output=$(git describe --tags --abbrev=0) echo "::set-output name=release::$output" From ad28fd53f60c16ba181247bf972f4435b9232ae0 Mon Sep 17 00:00:00 2001 From: jared-rimmer Date: Fri, 2 Jun 2023 15:17:06 +0100 Subject: [PATCH 7/7] Add fetch-depth --- .github/workflows/ci_test_package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 7451a390..6adc46fb 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -50,6 +50,8 @@ jobs: - name: Checkout id: latest_release uses: actions/checkout@v3 + with: + fetch-depth: 0 - run: | output=$(git describe --tags --abbrev=0) echo "::set-output name=release::$output"