From c834750cdd791bd1e55500df9140da6f2e6f8c8a Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Mon, 24 Jul 2023 10:27:56 +0000 Subject: [PATCH 1/2] ci: reduce duplication --- .github/actions/setup-sqlc/action.yaml | 10 ++++++++++ .github/workflows/ci.yaml | 4 +--- .github/workflows/pr-deploy.yaml | 4 +--- .github/workflows/security.yaml | 4 +--- 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 .github/actions/setup-sqlc/action.yaml diff --git a/.github/actions/setup-sqlc/action.yaml b/.github/actions/setup-sqlc/action.yaml new file mode 100644 index 0000000000000..354e55e8213f6 --- /dev/null +++ b/.github/actions/setup-sqlc/action.yaml @@ -0,0 +1,10 @@ +name: Setup sqlc +description: | + Sets up the sqlc environment for tests, builds, etc. +runs: + using: "composite" + steps: + - name: Setup sqlc + uses: sqlc-dev/setup-sqlc@v3 + with: + sqlc-version: "1.19.1" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 09dae78c320e5..c353ac6fe7458 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -164,9 +164,7 @@ jobs: uses: ./.github/actions/setup-go - name: Setup sqlc - uses: sqlc-dev/setup-sqlc@v3 - with: - sqlc-version: "1.19.1" + uses: ./github/actions/setup-sqlc - name: go install tools run: | diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml index 558dff22b8e70..83a040026fb4f 100644 --- a/.github/workflows/pr-deploy.yaml +++ b/.github/workflows/pr-deploy.yaml @@ -98,9 +98,7 @@ jobs: uses: ./.github/actions/setup-go - name: Setup sqlc - uses: sqlc-dev/setup-sqlc@v3 - with: - sqlc-version: "1.19.1" + uses: ./.github/actions/setup-sqlc - name: GHCR Login uses: docker/login-action@v2 diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index a703a1bb90b32..6e3afc18588fa 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -81,9 +81,7 @@ jobs: js-${{ runner.os }}- - name: Setup sqlc - uses: sqlc-dev/setup-sqlc@v3 - with: - sqlc-version: "1.19.1" + uses: ./.github/actions/setup-sqlc - name: Install yq run: go run github.com/mikefarah/yq/v4@v4.30.6 From c5d006512a7c5c6b8799dd173861b49be6360d9b Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Mon, 24 Jul 2023 10:35:07 +0000 Subject: [PATCH 2/2] typo --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c353ac6fe7458..06fd07fb99275 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -164,7 +164,7 @@ jobs: uses: ./.github/actions/setup-go - name: Setup sqlc - uses: ./github/actions/setup-sqlc + uses: ./.github/actions/setup-sqlc - name: go install tools run: |