From c1ec6453cbeb50cf59e14b1ef8ab18c122259f9b Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 10 Aug 2022 09:04:24 +0200 Subject: [PATCH] Revert "update-ci-only" (#12882) * Revert "update-ci-only (#12865)" This reverts commit b6f867d0b674d62e56b27aa4d00f5b6042ebac9e. * modify go file --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/cosmovisor-release.yml | 2 +- .github/workflows/e2e.yml | 4 ++-- .github/workflows/legacy-test.yml | 8 ++++---- .github/workflows/lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sims-045.yml | 10 +++++----- .github/workflows/sims-046.yml | 10 +++++----- .github/workflows/sims.yml | 8 ++++---- .github/workflows/test.yml | 12 ++++++------ Dockerfile | 2 +- contrib/images/simd-dlv/Dockerfile | 2 +- contrib/images/simd-env/Dockerfile | 2 +- contrib/rosetta/rosetta-ci/Dockerfile | 2 +- contrib/rosetta/rosetta-cli/Dockerfile | 2 +- simapp/app_legacy.go | 1 + 16 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 67de44c531..968b24c944 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/cosmovisor-release.yml b/.github/workflows/cosmovisor-release.yml index 0f93389c97..93d5b23c75 100644 --- a/.github/workflows/cosmovisor-release.yml +++ b/.github/workflows/cosmovisor-release.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 # get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/cosmovisor/}" >> $GITHUB_ENV diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1dfb07972a..6598e00166 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 id: git_diff with: @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 with: PATTERNS: | diff --git a/.github/workflows/legacy-test.yml b/.github/workflows/legacy-test.yml index 9e70a3b0b2..51800984de 100644 --- a/.github/workflows/legacy-test.yml +++ b/.github/workflows/legacy-test.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Build run: GOARCH=${{ matrix.go-arch }} LEDGER_ENABLED=false make build @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Run submodule tests and create test coverage profile. run: bash scripts/module-tests.sh - uses: actions/upload-artifact@v3 @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Create a file with all core Cosmos SDK pkgs run: go list ./... > pkgs.txt - name: Split pkgs into 4 files @@ -91,7 +91,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: actions/download-artifact@v3 with: name: "${{ github.sha }}-${{ matrix.part }}" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a95abae916..ae4f30a2c9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.0 id: git_diff diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1565343050..c0f0d1c762 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Unshallow run: git fetch --prune --unshallow - name: Create release diff --git a/.github/workflows/sims-045.yml b/.github/workflows/sims-045.yml index 2b62cdf6da..8fa9e519c2 100644 --- a/.github/workflows/sims-045.yml +++ b/.github/workflows/sims-045.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - run: make build @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - name: Install runsim @@ -57,7 +57,7 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 @@ -77,7 +77,7 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 @@ -98,7 +98,7 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 diff --git a/.github/workflows/sims-046.yml b/.github/workflows/sims-046.yml index 1b103114c8..0126e3100c 100644 --- a/.github/workflows/sims-046.yml +++ b/.github/workflows/sims-046.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - run: make build @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - name: Install runsim @@ -58,7 +58,7 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 @@ -78,7 +78,7 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 @@ -98,7 +98,7 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index abc1f2c019..dbd248433c 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: technote-space/get-diff-action@v6.1.0 @@ -64,7 +64,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: actions/cache@v3 @@ -82,7 +82,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: actions/cache@v3 with: path: ~/go/bin @@ -99,7 +99,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21d96f80c1..c1a26183a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 id: git_diff with: @@ -67,7 +67,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 id: git_diff with: @@ -100,7 +100,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Create a file with all core Cosmos SDK pkgs run: go list ./... > pkgs.txt - name: Split pkgs into 4 files @@ -134,7 +134,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 with: PATTERNS: | @@ -250,7 +250,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.1.0 id: git_diff with: @@ -284,7 +284,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.18 - name: Display go version run: go version - uses: technote-space/get-diff-action@v6.1.0 diff --git a/Dockerfile b/Dockerfile index 69718406a3..026f222c59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys add foo # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys list # TODO: demo connecting rest-server (or is this in server now?) -FROM golang:1.19-alpine AS build-env +FROM golang:1.18-alpine AS build-env # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3 diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index d116c8a5d3..6a81ef3e81 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine AS build +FROM golang:1.18-alpine AS build RUN apk add build-base git linux-headers libc-dev RUN go install github.com/go-delve/delve/cmd/dlv@latest diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 540c61d826..dae68a2175 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine AS build +FROM golang:1.18-alpine AS build RUN apk add build-base git linux-headers diff --git a/contrib/rosetta/rosetta-ci/Dockerfile b/contrib/rosetta/rosetta-ci/Dockerfile index a333fdc01b..d4cfc58528 100644 --- a/contrib/rosetta/rosetta-ci/Dockerfile +++ b/contrib/rosetta/rosetta-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine as build +FROM golang:1.18-alpine as build RUN apk add --no-cache tar git diff --git a/contrib/rosetta/rosetta-cli/Dockerfile b/contrib/rosetta/rosetta-cli/Dockerfile index f4fc15d9bc..da6ef28792 100644 --- a/contrib/rosetta/rosetta-cli/Dockerfile +++ b/contrib/rosetta/rosetta-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine as build +FROM golang:1.18-alpine as build RUN apk add git gcc libc-dev --no-cache diff --git a/simapp/app_legacy.go b/simapp/app_legacy.go index 0ec50e6468..7cfd3df5be 100644 --- a/simapp/app_legacy.go +++ b/simapp/app_legacy.go @@ -232,6 +232,7 @@ func NewSimApp( evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, nftkeeper.StoreKey, group.StoreKey, ) + tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) // NOTE: The testingkey is just mounted for testing purposes. Actual applications should // not include this key.