Skip to content

Commit f062265

Browse files
mmsqemmsqe
committed
Merge remote-tracking branch 'origin/develop' into bump_v1.12.x
2 parents 324f559 + 7e30762 commit f062265

File tree

191 files changed

+8222
-13246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+8222
-13246
lines changed

‎.envrc.example‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# default: go, gomod2nix
2+
# rocksdb: go, gomod2nix, librocksdb
3+
# full: go, gomod2nix, librocksdb, python env
4+
use flake .#full
5+
TMPDIR=/tmp

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches:
55
- develop
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
cleanup-runs:
913
runs-on: ubuntu-latest

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
schedule:
2121
- cron: '37 21 * * 4'
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
analyze:
2529
name: Analyze

‎.github/workflows/deploy-contract.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches:
55
- develop
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
cleanup-runs:
913
runs-on: ubuntu-latest

‎.github/workflows/lint.yml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
push:
88
branches:
99
- develop
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1015
jobs:
1116
golangci:
1217
name: Run golangci-lint
@@ -57,7 +62,11 @@ jobs:
5762
runs-on: ubuntu-latest
5863
steps:
5964
- uses: actions/checkout@v3
60-
- uses: cachix/install-nix-action@v20
65+
- uses: cachix/install-nix-action@v26
66+
with:
67+
nix_path: nixpkgs=channel:nixos-23.11
68+
extra_nix_config: |
69+
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
6170
- uses: cachix/cachix-action@v14
6271
with:
6372
name: crypto-ethermint
@@ -73,7 +82,11 @@ jobs:
7382
runs-on: ubuntu-latest
7483
steps:
7584
- uses: actions/checkout@v3
76-
- uses: cachix/install-nix-action@v20
85+
- uses: cachix/install-nix-action@v26
86+
with:
87+
nix_path: nixpkgs=channel:nixos-23.11
88+
extra_nix_config: |
89+
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
7790
- uses: cachix/cachix-action@v14
7891
with:
7992
name: crypto-ethermint

‎.github/workflows/markdown-links.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
paths:
1010
- '**.md'
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
markdown-link-check:
1418
runs-on: ubuntu-latest

‎.github/workflows/proto.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
paths:
77
- "proto/**"
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
lint:
1115
runs-on: ubuntu-latest

‎.github/workflows/security.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- develop
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
Gosec:
1014
permissions:

‎.github/workflows/semgrep.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
- .github/workflows/semgrep.yml
1010
schedule:
1111
- cron: '0 0 * * 0'
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1217
jobs:
1318
# Update from: https://semgrep.dev/docs/semgrep-ci/sample-ci-configs/#github-actions
1419
semgrep:

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- develop
77
- release/**
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
cleanup-runs:
1115
runs-on: ubuntu-latest
@@ -34,7 +38,7 @@ jobs:
3438
run: |
3539
make test-unit-cover
3640
if: env.GIT_DIFF
37-
- uses: codecov/codecov-action@v3
41+
- uses: codecov/codecov-action@v4
3842
with:
3943
file: ./coverage.txt
4044
fail_ci_if_error: true
@@ -93,9 +97,9 @@ jobs:
9397
TESTS_TO_RUN: ${{ matrix.tests }}
9498
steps:
9599
- uses: actions/checkout@v3
96-
- uses: cachix/install-nix-action@v23
100+
- uses: cachix/install-nix-action@v26
97101
with:
98-
nix_path: nixpkgs=channel:nixos-22.11
102+
nix_path: nixpkgs=channel:nixos-23.11
99103
extra_nix_config: |
100104
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
101105
- uses: cachix/cachix-action@v14
@@ -132,7 +136,11 @@ jobs:
132136
runs-on: ${{ matrix.os }}
133137
steps:
134138
- uses: actions/checkout@v3
135-
- uses: cachix/install-nix-action@v20
139+
- uses: cachix/install-nix-action@v26
140+
with:
141+
nix_path: nixpkgs=channel:nixos-23.11
142+
extra_nix_config: |
143+
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
136144
- uses: cachix/cachix-action@v14
137145
with:
138146
name: crypto-ethermint

0 commit comments

Comments
 (0)