From 733885c03c0598620de7d0cc559d09114bd2ebcc Mon Sep 17 00:00:00 2001 From: deepan95dev Date: Tue, 20 Feb 2024 10:10:22 +0530 Subject: [PATCH 01/15] fix: release permission check --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8d63b89f..1d80b85a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,8 @@ defaults: shell: bash permissions: contents: write - packages: write + packages: read + checks: write jobs: @@ -189,4 +190,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha - cache-to: type=gha,mode=min + cache-to: type=gha,mode=min \ No newline at end of file From dc19d4455e86a793cc5c1277b7d6cb296e102b98 Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 10:54:51 +0530 Subject: [PATCH 02/15] try fix go releaser --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d80b85a0..1b7613907 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,6 +106,9 @@ jobs: if: needs.release-guard.outputs.EXECUTE_RELEASE == 'true' steps: + - name: change permissions + run: sudo find ../ -type d -exec chmod 777 {} + + - uses: actions/checkout@v4 with: fetch-depth: 0 # Required to fetch version @@ -190,4 +193,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha - cache-to: type=gha,mode=min \ No newline at end of file + cache-to: type=gha,mode=min From adb2f4ebfae73a09bc9376eb95f2bda9d450670a Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 10:57:28 +0530 Subject: [PATCH 03/15] touch --- scripts/protocgen.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index d0dbb44f1..404c23341 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -16,6 +16,7 @@ for proto_dir in $proto_dirs; do done cd .. +touch test.txt # move proto files to the right places From 833939fdbb2423df36cb540a01fb4bcc07d216b9 Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 10:57:33 +0530 Subject: [PATCH 04/15] touch --- scripts/protocgen.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 404c23341..398e22744 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -17,6 +17,7 @@ done cd .. touch test.txt +ls -l # move proto files to the right places From 360f051ecbcb6d5198c2118e54941eb9c82b5d4e Mon Sep 17 00:00:00 2001 From: deepan95dev Date: Tue, 20 Feb 2024 10:59:26 +0530 Subject: [PATCH 05/15] release check --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b7613907..f6167f7bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: defaults: run: - shell: bash + shell: sudo bash permissions: contents: write packages: read From de7a48a3c4b7837ed2d17caa089e808aee340baf Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 11:00:10 +0530 Subject: [PATCH 06/15] try fix --- make/proto.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/proto.mk b/make/proto.mk index bfb89aa76..c52d04855 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -16,6 +16,7 @@ protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(con proto-all: proto-gen proto-swagger-gen proto-gen: + sudo find ../ -type d -exec chmod 777 {} + @echo "Generating Protobuf files" @$(protoImage) sh ./scripts/protocgen.sh; go mod tidy From bb61084fa0c9d33efad6f5cea6663375e2e5379e Mon Sep 17 00:00:00 2001 From: deepan95dev Date: Tue, 20 Feb 2024 11:01:08 +0530 Subject: [PATCH 07/15] release check --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6167f7bb..22fc4976f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,10 +4,10 @@ on: workflow_dispatch: defaults: run: - shell: sudo bash + shell: bash permissions: contents: write - packages: read + packages: write checks: write From 86f8c2bd6dc05c61874282ad7d24c4d56577e9ec Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 11:04:16 +0530 Subject: [PATCH 08/15] fix swagger --- make/proto.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/proto.mk b/make/proto.mk index c52d04855..fa4dba8d1 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -31,6 +31,7 @@ proto-lint: @$(protoImage) buf lint --error-format=json proto-swagger-gen: + sudo find ../ -type d -exec chmod 777 {} + @echo "Generating Protobuf Swagger" @$(protoImage) sh ./scripts/protoc-swagger-gen.sh; From 9f6979dd8050035dcdaad9fd6ebc461a4a40e148 Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 11:05:21 +0530 Subject: [PATCH 09/15] fix swagger gen --- .github/workflows/release.yml | 3 --- scripts/protocgen.sh | 2 -- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6167f7bb..9d9fb1325 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,9 +106,6 @@ jobs: if: needs.release-guard.outputs.EXECUTE_RELEASE == 'true' steps: - - name: change permissions - run: sudo find ../ -type d -exec chmod 777 {} + - - uses: actions/checkout@v4 with: fetch-depth: 0 # Required to fetch version diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 398e22744..d0dbb44f1 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -16,8 +16,6 @@ for proto_dir in $proto_dirs; do done cd .. -touch test.txt -ls -l # move proto files to the right places From 89c0afce73e3ee21176d0e65d683e52e273fca21 Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 11:11:18 +0530 Subject: [PATCH 10/15] fix --- make/proto.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/proto.mk b/make/proto.mk index fa4dba8d1..42d673596 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -32,6 +32,7 @@ proto-lint: proto-swagger-gen: sudo find ../ -type d -exec chmod 777 {} + + sudo chmod 666 ./app/client/docs/swagger.yaml @echo "Generating Protobuf Swagger" @$(protoImage) sh ./scripts/protoc-swagger-gen.sh; From 4733edda67a7e72e5e0be91989aba794b50acdf1 Mon Sep 17 00:00:00 2001 From: deepan95dev Date: Tue, 20 Feb 2024 11:19:33 +0530 Subject: [PATCH 11/15] release check --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 09f0c5031..bcdf9c9a1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ ### STAGE 1: Build node binary pre-requisites ### ############################################################### -FROM golang:1.18-alpine AS builder +FROM golang:1.21-alpine AS builder # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers findutils From f32f716495c8a97ad536ed343089abdad24a5454 Mon Sep 17 00:00:00 2001 From: akhilkumarpilli Date: Tue, 20 Feb 2024 11:32:52 +0530 Subject: [PATCH 12/15] update goreleaser config --- .goreleaser.yml | 4 ++-- make/proto.mk | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a26d1c1d5..630833951 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,8 +9,8 @@ before: hooks: - make clean - make tidy - - make proto-gen - - make swagger + - sudo make proto-gen + - sudo make swagger builds: - id: linux-amd64 diff --git a/make/proto.mk b/make/proto.mk index 42d673596..bfb89aa76 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -16,7 +16,6 @@ protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(con proto-all: proto-gen proto-swagger-gen proto-gen: - sudo find ../ -type d -exec chmod 777 {} + @echo "Generating Protobuf files" @$(protoImage) sh ./scripts/protocgen.sh; go mod tidy @@ -31,8 +30,6 @@ proto-lint: @$(protoImage) buf lint --error-format=json proto-swagger-gen: - sudo find ../ -type d -exec chmod 777 {} + - sudo chmod 666 ./app/client/docs/swagger.yaml @echo "Generating Protobuf Swagger" @$(protoImage) sh ./scripts/protoc-swagger-gen.sh; From 0a618911753144c7213506bdb99c9f63c162af9f Mon Sep 17 00:00:00 2001 From: akhilkumarpilli Date: Tue, 20 Feb 2024 11:34:38 +0530 Subject: [PATCH 13/15] revert changes --- .goreleaser.yml | 4 ++-- make/proto.mk | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 630833951..a26d1c1d5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,8 +9,8 @@ before: hooks: - make clean - make tidy - - sudo make proto-gen - - sudo make swagger + - make proto-gen + - make swagger builds: - id: linux-amd64 diff --git a/make/proto.mk b/make/proto.mk index bfb89aa76..42d673596 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -16,6 +16,7 @@ protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(con proto-all: proto-gen proto-swagger-gen proto-gen: + sudo find ../ -type d -exec chmod 777 {} + @echo "Generating Protobuf files" @$(protoImage) sh ./scripts/protocgen.sh; go mod tidy @@ -30,6 +31,8 @@ proto-lint: @$(protoImage) buf lint --error-format=json proto-swagger-gen: + sudo find ../ -type d -exec chmod 777 {} + + sudo chmod 666 ./app/client/docs/swagger.yaml @echo "Generating Protobuf Swagger" @$(protoImage) sh ./scripts/protoc-swagger-gen.sh; From 98db09374d5c07cac7b9fdd0b65e551b4594dfe3 Mon Sep 17 00:00:00 2001 From: deepan95dev Date: Tue, 20 Feb 2024 12:16:56 +0530 Subject: [PATCH 14/15] fix: ante handler ibc fix --- ante/testutil_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ante/testutil_test.go b/ante/testutil_test.go index 1041de08c..83d01204f 100644 --- a/ante/testutil_test.go +++ b/ante/testutil_test.go @@ -87,6 +87,7 @@ func (s *AnteTestSuite) SetupTest(isCheckTx bool) error { ResourceKeeper: s.app.ResourceKeeper, SignModeHandler: encodingConfig.TxConfig.SignModeHandler(), SigGasConsumer: sdkante.DefaultSigVerificationGasConsumer, + IBCKeeper: s.app.IBCKeeper, }, ) if err != nil { From 66f7bf73d077d9208844241714d3c7b12a481788 Mon Sep 17 00:00:00 2001 From: atheesh Date: Tue, 20 Feb 2024 13:41:39 +0530 Subject: [PATCH 15/15] review changes --- .github/workflows/release.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbc3b85f8..ed36acf41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,11 +5,6 @@ on: defaults: run: shell: bash -permissions: - contents: write - packages: write - checks: write - jobs: # Super Linter only runs on diffs in PRs