From 818cc4f361a65355bee29dd27e57775e218105a4 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 1 Apr 2021 09:50:57 +0700 Subject: [PATCH 1/3] set Go 1.15 in go.mod and run go mod tidy in copy workflow --- .github/workflows/copy-workflow.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/copy-workflow.yml b/.github/workflows/copy-workflow.yml index cdbcf062..a95f4b76 100644 --- a/.github/workflows/copy-workflow.yml +++ b/.github/workflows/copy-workflow.yml @@ -23,14 +23,25 @@ jobs: repository: ${{ matrix.cfg.target }} token: ${{ secrets.WEB3BOT_GITHUB_TOKEN }} persist-credentials: true + - name: git config + run: | + git config user.name web3-bot + git config user.email "web3-bot@users.noreply.github.com" + - name: run go mod tidy + run: | + go mod edit -go 1.15 + go mod tidy + if ! git diff --quiet; then + git add . + git commit -m "run go mod tidy" + echo "NEEDS_UPDATE=1" >> $GITHUB_ENV + fi - name: Checkout template repository uses: actions/checkout@v2 with: path: ${{ env.TEMPLATE_REPO_DIR }} - - name: Create commits + - name: Add files run: | - git config user.name web3-bot - git config user.email "web3-bot@users.noreply.github.com" for f in $(jq -r ".[]" <<< '${{ toJson(github.event.client_payload.files) }}'); do echo -e "\nProcessing $f." # add DO NOT EDIT header From e4158e1cde1014954c9cfa2ffc47821669e96186 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 1 Apr 2021 09:58:16 +0700 Subject: [PATCH 2/3] run gofmt -s in copy workflow --- .github/workflows/copy-workflow.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/copy-workflow.yml b/.github/workflows/copy-workflow.yml index a95f4b76..6fb7b575 100644 --- a/.github/workflows/copy-workflow.yml +++ b/.github/workflows/copy-workflow.yml @@ -36,6 +36,14 @@ jobs: git commit -m "run go mod tidy" echo "NEEDS_UPDATE=1" >> $GITHUB_ENV fi + - name: gofmt + run: | + gofmt -s -w . + if ! git diff --quiet; then + git add . + git commit -m "run gofmt -s" + echo "NEEDS_UPDATE=1" >> $GITHUB_ENV + fi - name: Checkout template repository uses: actions/checkout@v2 with: From 163a6f2e5868d22c373e1348da6619721dc5918b Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 1 Apr 2021 17:32:23 +0700 Subject: [PATCH 3/3] improve the commit message when updating go.mod --- .github/workflows/copy-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/copy-workflow.yml b/.github/workflows/copy-workflow.yml index 6fb7b575..7a9d67ed 100644 --- a/.github/workflows/copy-workflow.yml +++ b/.github/workflows/copy-workflow.yml @@ -33,7 +33,7 @@ jobs: go mod tidy if ! git diff --quiet; then git add . - git commit -m "run go mod tidy" + git commit -m "set Go version to 1.15 and run go mod tidy" echo "NEEDS_UPDATE=1" >> $GITHUB_ENV fi - name: gofmt