From 33f25281af12560509b3efc78cc26fd620a9ea43 Mon Sep 17 00:00:00 2001 From: srinandan Date: Fri, 20 Sep 2024 18:46:23 +0000 Subject: [PATCH] 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"