Merge branch 'master' into moul-patch-5

moul · Sep 21, 2023 · d8872d3 · d8872d3
2 parents 5ee47a8 + 1ccf42d
commit d8872d3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 1
     - uses: actions/setup-go@v4
       with:
-        goversion: "1.21.x"
+        go-version: "1.21.x"
     - name: "gobenchdata publish: ${{ inputs.publish }}"
       run: go run go.bobheadxi.dev/gobenchdata@v1 action
       env:

diff --git a/.github/workflows/db-tests.yml b/.github/workflows/db-tests.yml
@@ -29,10 +29,12 @@ jobs:
           - fsdb
           - boltdb
     steps:
+      - uses: actions/checkout@v4
+
       # golang
       - uses: actions/setup-go@v4
         with:
-          goversion: ${{ matrix.goversion }}
+          go-version: ${{ matrix.goversion }}
 
       # leveldb
       - name: install leveldb
@@ -46,6 +48,5 @@ jobs:
           sudo dpkg -i *.deb
 
       # test ./pkgs/db
-      - uses: actions/checkout@v4
       - name: test ./tm2/pkg/db
         run: go test -tags ${{ matrix.tags }} ./tm2/pkg/db/...
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -27,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          goversion: ${{ matrix.goversion }}
-      - uses: actions/checkout@v4
+          go-version: ${{ matrix.goversion }}
       - run: go install -v ./gnovm/cmd/gno
       - run: go run ./gnovm/cmd/gno precompile --verbose ./examples
       - run: go run ./gnovm/cmd/gno build --verbose ./examples
@@ -45,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          goversion: ${{ matrix.goversion }}
-      - uses: actions/checkout@v4
+          go-version: ${{ matrix.goversion }}
       - run: go install -v ./gnovm/cmd/gno
       - run: go run ./gnovm/cmd/gno test --verbose ./examples
   lint:
@@ -62,10 +62,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          goversion: ${{ matrix.goversion }}
-      - uses: actions/checkout@v4
+          go-version: ${{ matrix.goversion }}
       - run: go install -v ./gnovm/cmd/gno
       # testing official directories, basically examples/ minus examples/.../x/.
       - run: go run ./gnovm/cmd/gno lint --verbose ./examples/gno.land/p

diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -13,13 +13,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          goversion: 1.21.x
-
-      - name: Checkout code
-        uses: actions/checkout@v4
+          go-version: 1.21.x
 
       - name: Lint
         uses: golangci/golangci-lint-action@v3
@@ -31,17 +31,17 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          goversion: 1.20.x
+          go-version: 1.21.x
 
       - name: Install make
         run: sudo apt-get install -y make
 
-      - name: Checkout code
-        uses: actions/checkout@v4
-
       # prefill dependencies so that mod messages don't show up in make output
       - name: Fetch dependencies
         run: go mod download -modfile ./misc/devdeps/go.mod -x
@@ -61,13 +61,13 @@ jobs:
   modtidy:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          goversion: 1.20.x
-
-      - name: Checkout code
-        uses: actions/checkout@v4
+          go-version: 1.21.x
 
       - name: Check go.mods
         run: |

diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml
@@ -61,6 +61,7 @@ jobs:
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
+          touch coverage.out
       - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
         uses: codecov/codecov-action@v3
         with:

diff --git a/tm2/pkg/tmp.go b/tm2/pkg/tmp.go