From ee8a3f8f387f9223772b64571800b29b1cbe58d5 Mon Sep 17 00:00:00 2001 From: ocobleseqx Date: Fri, 3 Nov 2023 17:20:05 +0100 Subject: [PATCH] fix: add missing upstream sync step in gh actions Signed-off-by: ocobleseqx --- .github/workflows/lint.yml | 7 +++---- .github/workflows/run-acceptance-tests.yml | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a8a6de51..0d254729 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,10 +32,9 @@ jobs: continue-on-error: true # this fails if there are no go:embed directives run: | git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g' - # TODO add upstream - # - name: prepare upstream - # continue-on-error: true - # run: make upstream + - name: prepare upstream + continue-on-error: true + run: make upstream - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 7722f928..aaa15ff7 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -316,7 +316,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 with: - gradle-version: "7.4.1" + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v2 with: @@ -350,6 +350,8 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 + - name: Make upstream + run: make upstream - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt