From df9c556c88f69a7fc966be3c6c6215fac74fed74 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Fri, 6 Oct 2023 10:40:31 +0700 Subject: [PATCH 01/16] add tidy job --- .github/workflows/build.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3cfe4e957f..4280a170651 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,3 +77,20 @@ jobs: with: name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} path: cmd/osmosisd/osmosisd + tidy: + runs-on: ubuntu-latest + name: Tidy + steps: + - uses: actions/checkout@v3 + - name: Setup go + uses: actions/setup-go@v3 + with: + go-version: ${{env.GO_VERSION}} + - run: | + go mod tidy + CHANGES_IN_REPO=$(git status --porcelain) + if [[ -n "$CHANGES_IN_REPO" ]]; then + echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:" + git status && git --no-pager diff + exit 1 + fi \ No newline at end of file From 8992fc675e4a9a7c4b699593d44a220e84f63bfd Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 10:19:14 +0700 Subject: [PATCH 02/16] use tidy-workspace --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4280a170651..79dc6594264 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,7 @@ jobs: name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} path: cmd/osmosisd/osmosisd tidy: + needs: build runs-on: ubuntu-latest name: Tidy steps: @@ -87,7 +88,7 @@ jobs: with: go-version: ${{env.GO_VERSION}} - run: | - go mod tidy + make tidy-workspace CHANGES_IN_REPO=$(git status --porcelain) if [[ -n "$CHANGES_IN_REPO" ]]; then echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:" From 31074befbf91b4695408128cae6e9dfe882df836 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 10:22:54 +0700 Subject: [PATCH 03/16] tidy first --- .github/workflows/build.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79dc6594264..c017d9de2c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,25 @@ concurrency: cancel-in-progress: true jobs: + tidy: + runs-on: ubuntu-latest + name: Tidy + steps: + - uses: actions/checkout@v3 + - name: Setup go + uses: actions/setup-go@v3 + with: + go-version: ${{env.GO_VERSION}} + - run: | + make tidy-workspace + CHANGES_IN_REPO=$(git status --porcelain) + if [[ -n "$CHANGES_IN_REPO" ]]; then + echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:" + git status && git --no-pager diff + exit 1 + fi build: + needs: tidy name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} runs-on: ubuntu-latest @@ -76,22 +94,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} - path: cmd/osmosisd/osmosisd - tidy: - needs: build - runs-on: ubuntu-latest - name: Tidy - steps: - - uses: actions/checkout@v3 - - name: Setup go - uses: actions/setup-go@v3 - with: - go-version: ${{env.GO_VERSION}} - - run: | - make tidy-workspace - CHANGES_IN_REPO=$(git status --porcelain) - if [[ -n "$CHANGES_IN_REPO" ]]; then - echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:" - git status && git --no-pager diff - exit 1 - fi \ No newline at end of file + path: cmd/osmosisd/osmosisd \ No newline at end of file From ded76a614370c882c72a70ba7fe982c7e7231704 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 14:54:48 +0700 Subject: [PATCH 04/16] add and commit --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c017d9de2c2..7c35601e662 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,12 +41,9 @@ jobs: go-version: ${{env.GO_VERSION}} - run: | make tidy-workspace - CHANGES_IN_REPO=$(git status --porcelain) - if [[ -n "$CHANGES_IN_REPO" ]]; then - echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:" - git status && git --no-pager diff - exit 1 - fi + - uses: EndBug/add-and-commit@v9 + with: + message: 'make tidy-workspace' build: needs: tidy name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} From 4cb0823d717d53623dc36ba34f35b52f78101ed0 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 15:19:35 +0700 Subject: [PATCH 05/16] git checkout --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c35601e662..5ed69ef24ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,9 +34,12 @@ jobs: runs-on: ubuntu-latest name: Tidy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.event.pull_request.head.ref }} - name: Setup go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{env.GO_VERSION}} - run: | From b817710cd3b52a4d5d2e1a410881d309b4c9e243 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 15:26:47 +0700 Subject: [PATCH 06/16] test with >>>>>>> --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 42b42b5e688..bf5c5c502be 100644 --- a/go.sum +++ b/go.sum @@ -939,6 +939,7 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +>>>>>>>>>>>>>> github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= From e9d13caa76023cec5d2c5a1f306718bb499f0090 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 08:28:23 +0000 Subject: [PATCH 07/16] make tidy-workspace --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index bf5c5c502be..42b42b5e688 100644 --- a/go.sum +++ b/go.sum @@ -939,7 +939,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= ->>>>>>>>>>>>>> github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= From dffb4ddaccb6107509173d88753f911ec8533779 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 15:39:47 +0700 Subject: [PATCH 08/16] not trigger CI --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed69ef24ec..37032b9c2de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,8 @@ jobs: - uses: EndBug/add-and-commit@v9 with: message: 'make tidy-workspace' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build: needs: tidy name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} From b7858db8a56a2be39e89566e1469273d09609359 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 15:41:47 +0700 Subject: [PATCH 09/16] test with >>>>>>> --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 42b42b5e688..994b5ef7bcc 100644 --- a/go.sum +++ b/go.sum @@ -934,6 +934,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +>>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From 0224cef5e851908a60cce08f0b9ae44ac3b17494 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 08:43:13 +0000 Subject: [PATCH 10/16] make tidy-workspace --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index 994b5ef7bcc..42b42b5e688 100644 --- a/go.sum +++ b/go.sum @@ -934,7 +934,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= ->>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From 668434260c6215511056d21ff0d459b378c1fd62 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 15:47:47 +0700 Subject: [PATCH 11/16] test with >>>>>>> --- .github/workflows/build.yml | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37032b9c2de..59997ea886e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: with: message: 'make tidy-workspace' env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }} build: needs: tidy name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }} diff --git a/go.sum b/go.sum index 42b42b5e688..994b5ef7bcc 100644 --- a/go.sum +++ b/go.sum @@ -934,6 +934,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +>>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From e26c0386334d8e921c5a332166121ccff97e1e06 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 08:48:52 +0000 Subject: [PATCH 12/16] make tidy-workspace --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index 994b5ef7bcc..42b42b5e688 100644 --- a/go.sum +++ b/go.sum @@ -934,7 +934,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= ->>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From 823ad21e487af3c082519afa837aa43d3029167e Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 16:01:06 +0700 Subject: [PATCH 13/16] test with >>>>>>> --- .github/workflows/build.yml | 1 + go.sum | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59997ea886e..758af14d968 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,7 @@ jobs: with: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} + token: ${{ secrets.ADD_TO_PROJECT_PAT }} - name: Setup go uses: actions/setup-go@v4 with: diff --git a/go.sum b/go.sum index 42b42b5e688..994b5ef7bcc 100644 --- a/go.sum +++ b/go.sum @@ -934,6 +934,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +>>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From 6661532dff6491cf571f9d282fe53632725fb259 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Mon, 9 Oct 2023 09:02:04 +0000 Subject: [PATCH 14/16] make tidy-workspace --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index 994b5ef7bcc..42b42b5e688 100644 --- a/go.sum +++ b/go.sum @@ -934,7 +934,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= ->>>>>>>>>>>> github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= From fda8cdcdc15b570dfa7b47d9e04bdcd4564b5391 Mon Sep 17 00:00:00 2001 From: anhductn2001 Date: Sat, 14 Oct 2023 16:06:02 +0700 Subject: [PATCH 15/16] test with no changes --- app/ante.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/ante.go b/app/ante.go index 828e9aebec0..0bc7cd9bb2d 100644 --- a/app/ante.go +++ b/app/ante.go @@ -18,6 +18,7 @@ import ( txfeestypes "github.com/osmosis-labs/osmosis/v19/x/txfees/types" ) +// Test // Link to default ante handler used by cosmos sdk: // https://github.com/cosmos/cosmos-sdk/blob/v0.43.0/x/auth/ante/ante.go#L41 func NewAnteHandler( From 45aac0a563e404124d2406d878f88d79c1bd38fc Mon Sep 17 00:00:00 2001 From: "Matt, Park" <45252226+mattverse@users.noreply.github.com> Date: Mon, 20 Nov 2023 11:06:42 +0900 Subject: [PATCH 16/16] Update app/ante.go --- app/ante.go | 1 - 1 file changed, 1 deletion(-) diff --git a/app/ante.go b/app/ante.go index 0bc7cd9bb2d..828e9aebec0 100644 --- a/app/ante.go +++ b/app/ante.go @@ -18,7 +18,6 @@ import ( txfeestypes "github.com/osmosis-labs/osmosis/v19/x/txfees/types" ) -// Test // Link to default ante handler used by cosmos sdk: // https://github.com/cosmos/cosmos-sdk/blob/v0.43.0/x/auth/ante/ante.go#L41 func NewAnteHandler(