Skip to content

Commit

Permalink
Merge branch 'master' into sdk-47
Browse files Browse the repository at this point in the history
  • Loading branch information
mmsqe committed Feb 23, 2024
2 parents 9d6ec50 + e344315 commit 9fd2de3
Show file tree
Hide file tree
Showing 69 changed files with 1,569 additions and 1,100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- uses: actions/checkout@v3
with:
submodules: true
- name: install govulncheck
run: go install -v golang.org/x/vuln/cmd/govulncheck@v0.0.0-20221208170415-d970d6cd0f6e
run: go install -v golang.org/x/vuln/cmd/govulncheck@v1.0.4
- name: govuln sec scan
run: govulncheck ./...
20 changes: 7 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -137,11 +137,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -175,7 +172,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: install runsim
run: |
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -200,7 +197,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -247,7 +244,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -294,7 +291,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -410,12 +407,9 @@ jobs:
files: |
go.mod
go.sum
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
if: steps.changed-files.outputs.any_changed == 'true'
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: update gomod2nix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- name: Normal check out code
uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- uses: actions/checkout@v3
with:
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.20.3
go-version: 1.22
- uses: actions/checkout@v3
with:
submodules: true
Expand All @@ -28,7 +28,7 @@ jobs:
- uses: golangci/golangci-lint-action@v3
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.51
version: v1.55
args: --timeout 10m
github-token: ${{ secrets.github_token }}
if: steps.changed-files.outputs.any_changed == 'true'
76 changes: 23 additions & 53 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ on:
tags:
- "*"

env:
NIXPKGS_ALLOW_INSECURE: 1

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -36,11 +36,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -53,7 +50,7 @@ jobs:
run: make nix-integration-test
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -82,11 +79,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -104,11 +98,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -118,7 +109,7 @@ jobs:
run: make nix-integration-test-upgrade
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -142,11 +133,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -156,7 +144,7 @@ jobs:
run: make nix-integration-test-ledger
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -180,11 +168,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -194,7 +179,7 @@ jobs:
run: make nix-integration-test-solomachine
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -218,11 +203,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -232,7 +214,7 @@ jobs:
run: make nix-integration-test-slow
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -256,11 +238,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -270,7 +249,7 @@ jobs:
run: make nix-integration-test-ibc
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -294,11 +273,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -308,7 +284,7 @@ jobs:
run: make nix-integration-test-byzantine
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -332,11 +308,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -346,7 +319,7 @@ jobs:
run: make nix-integration-test-gov
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand All @@ -371,11 +344,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v23
with:
# pin to nix-2.13 to workaround compability issue of 2.14,
# see: https://github.com/cachix/install-nix-action/issues/161
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
Expand All @@ -385,7 +355,7 @@ jobs:
run: make nix-integration-test-grpc
- name: Convert coverage data
run: |
nix profile install nixpkgs#go_1_20
nix profile install nixpkgs#go_1_22
go tool covdata textfmt -i=coverage -o profile.txt
- name: Upload coverage report
uses: codecov/codecov-action@v3
Expand Down
Loading

0 comments on commit 9fd2de3

Please sign in to comment.