From 176e695002e62fe0edf61f7f488a267d14fe7d5e Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:30:28 +0000 Subject: [PATCH 1/5] chore: upgrade github actions #542 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/gen-docs.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/gorelease-action.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d62a087ea..b0f9a88a1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -52,7 +52,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 575a84031..1ba57cfbb 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index 5bcfb6d74..61a23efbf 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Push GH Pages run: | git config --global user.name "apigeecli Publish Action" diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4b7403712..3b9ce68db 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -31,7 +31,7 @@ jobs: with: go-version: '1.21' cache: false - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/.github/workflows/gorelease-action.yml b/.github/workflows/gorelease-action.yml index 4694662da..53dd0987e 100644 --- a/.github/workflows/gorelease-action.yml +++ b/.github/workflows/gorelease-action.yml @@ -27,8 +27,8 @@ jobs: goreleaser: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: #go-version: '>=1.18.0' go-version-file: './go.mod' From f186b8d38d8c0e3d7bc28126f9274255c9380da9 Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:38:22 +0000 Subject: [PATCH 2/5] chore: fetch branches #542 --- .github/workflows/gen-docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index 61a23efbf..fd6c0f312 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -31,6 +31,7 @@ jobs: uses: actions/checkout@v4 - name: Push GH Pages run: | + git fetch origin git config --global user.name "apigeecli Publish Action" git config --global user.email "apigeecli-bot@noreply.apigee.com" From 9cfb5b8f95e12579ad0fc9b4c018c842ae9f0c0b Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:42:13 +0000 Subject: [PATCH 3/5] chore: git pull #542 --- .github/workflows/gen-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index fd6c0f312..cc4f2ab56 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4 - name: Push GH Pages run: | - git fetch origin + git pull origin main git config --global user.name "apigeecli Publish Action" git config --global user.email "apigeecli-bot@noreply.apigee.com" From 33f25281af12560509b3efc78cc26fd620a9ea43 Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:46:23 +0000 Subject: [PATCH 4/5] chore: merge changes #542 --- .github/workflows/gen-docs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index cc4f2ab56..8770117c6 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -31,10 +31,12 @@ jobs: uses: actions/checkout@v4 - name: Push GH Pages run: | - git pull origin main + git config pull.rebase false git config --global user.name "apigeecli Publish Action" git config --global user.email "apigeecli-bot@noreply.apigee.com" + git pull origin main + GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0 /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings" /tmp/go-licenses save ./cmd/apigeecli --save_path=third-party --force || echo "Ignore warnings" From f24bdae5e2fef0f4af05ba5f74d47145fe017e40 Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:53:15 +0000 Subject: [PATCH 5/5] chore: merge changes #542 --- .github/workflows/gen-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index 8770117c6..55cd99900 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -35,7 +35,7 @@ jobs: git config --global user.name "apigeecli Publish Action" git config --global user.email "apigeecli-bot@noreply.apigee.com" - git pull origin main + git pull origin main --allow-unrelated-histories GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0 /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"