Skip to content

Commit 3b61ff3

Browse files
authored
Merge pull request #4430 from iron-fish/staging
STAGING -> MASTER
2 parents 246e55d + fa0736c commit 3b61ff3

File tree

117 files changed

+4481
-6223
lines changed

Some content is hidden

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

117 files changed

+4481
-6223
lines changed

.github/workflows/build-ironfish-rust-nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Use Node.js
5252
uses: actions/setup-node@v3
5353
with:
54-
node-version: '18.12.1'
54+
node-version: 18
5555
cache: yarn
5656

5757
- name: Install Rust
@@ -121,7 +121,7 @@ jobs:
121121
- name: Use Node.js
122122
uses: actions/setup-node@v3
123123
with:
124-
node-version: '18.12.1'
124+
node-version: 18
125125

126126
- name: Download artifacts
127127
uses: actions/download-artifact@v3

.github/workflows/ci-regenerate-fixtures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Use Node.js
1919
uses: actions/setup-node@v3
2020
with:
21-
node-version: '18.12.1'
21+
node-version: 18
2222
cache: 'yarn'
2323

2424
- name: Cache Rust

.github/workflows/ci.yml

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Use Node.js
2222
uses: actions/setup-node@v3
2323
with:
24-
node-version: '18.12.1'
24+
node-version: 18
2525
cache: 'yarn'
2626

2727
- name: Install packages
@@ -39,9 +39,13 @@ jobs:
3939
- name: Lint
4040
run: yarn lint
4141

42-
test:
43-
name: Test
42+
test-matrix:
43+
name: Test Matrix
4444
runs-on: ubuntu-latest
45+
strategy:
46+
matrix:
47+
node-version: [18, 20]
48+
test-type: ["test", "test:slow"]
4549

4650
steps:
4751
- name: Check out Git repository
@@ -50,7 +54,7 @@ jobs:
5054
- name: Use Node.js
5155
uses: actions/setup-node@v3
5256
with:
53-
node-version: '18.12.1'
57+
node-version: ${{ matrix.version }}
5458
cache: 'yarn'
5559

5660
- name: Cache Rust
@@ -62,7 +66,7 @@ jobs:
6266
run: yarn --non-interactive --frozen-lockfile
6367

6468
- name: Run tests
65-
run: yarn test:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
69+
run: yarn ${{ matrix.test-type}}:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
6670

6771
- name: Check for missing fixtures
6872
run: |
@@ -75,38 +79,13 @@ jobs:
7579
if: github.repository == 'iron-fish/ironfish'
7680
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload
7781

78-
testslow:
79-
name: Slow Tests
82+
# This is a workaround to have status checks on jobs that use a matrix.
83+
# See: https://github.com/orgs/community/discussions/26822
84+
test:
85+
if: ${{ always() }}
8086
runs-on: ubuntu-latest
81-
87+
name: Test
88+
needs: [test-matrix]
8289
steps:
83-
- name: Check out Git repository
84-
uses: actions/checkout@v3
85-
86-
- name: Use Node.js
87-
uses: actions/setup-node@v3
88-
with:
89-
node-version: '18.12.1'
90-
cache: 'yarn'
91-
92-
- name: Cache Rust
93-
uses: Swatinem/rust-cache@v2
94-
with:
95-
shared-key: nodejs
96-
97-
- name: Install packages
98-
run: yarn --non-interactive --frozen-lockfile
99-
100-
- name: Run slow tests & coverage
101-
run: yarn test:slow:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
102-
103-
- name: Check for missing fixtures
104-
run: |
105-
if [[ $(git status | grep fixture) ]]; then
106-
echo "New test fixtures have not been checked in, please check them in."
107-
exit 1
108-
fi
109-
110-
- name: Upload coverage
111-
if: github.repository == 'iron-fish/ironfish'
112-
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload
90+
- run: exit 1
91+
if: ${{ !contains(needs.*.result, 'success')}}

.github/workflows/deploy-brew.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Use Node.js
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: '18.12.1'
27+
node-version: 18
2828
cache: 'yarn'
2929

3030
- name: Build Ironfish CLI

.github/workflows/deploy-npm-ironfish-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Use Node.js
1717
uses: actions/setup-node@v3
1818
with:
19-
node-version: '18.12.1'
19+
node-version: 18
2020
registry-url: 'https://registry.npmjs.org'
2121
cache: yarn
2222

.github/workflows/deploy-npm-ironfish-rust-nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup node
2727
uses: actions/setup-node@v3
2828
with:
29-
node-version: '18.12.1'
29+
node-version: 18
3030
registry-url: 'https://registry.npmjs.org'
3131
cache: yarn
3232

.github/workflows/deploy-npm-ironfish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Use Node.js
1414
uses: actions/setup-node@v3
1515
with:
16-
node-version: '18.12.1'
16+
node-version: 18
1717
registry-url: 'https://registry.npmjs.org'
1818
cache: yarn
1919

.github/workflows/perf_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Use Node.js
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: '18.12.1'
27+
node-version: 18
2828
cache: 'yarn'
2929

3030
- name: Install packages

.github/workflows/publish-binaries.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- host: ubuntu-20.04
2424
arch: x86_64
2525
system: linux
26-
26+
2727
- host: [self-hosted, macOS, ARM64]
2828
arch: arm64
2929
system: apple
@@ -32,7 +32,6 @@ jobs:
3232
# - host: ubuntu-20.04
3333
# arch: aarch64
3434
# system: linux
35-
3635

3736
# - host: ubuntu-20.04
3837
# target: aarch64-apple-darwin
@@ -50,11 +49,11 @@ jobs:
5049
- name: Use Node.js
5150
uses: actions/setup-node@v3
5251
with:
53-
node-version: '18.12.1'
52+
node-version: 18
5453

5554
- name: npm init
5655
run: npm init -y
57-
56+
5857
- name: install dependencies
5958
run: npm install ironfish [email protected]
6059

@@ -63,7 +62,7 @@ jobs:
6362
run: |
6463
npx caxa --uncompression-message "Running the CLI for the first time may take a while, please wait..." --input . --output "${{ matrix.settings.system != 'windows' && 'ironfish' || 'ironfish.exe' }}" -- "{{caxa}}/node_modules/.bin/node" "--enable-source-maps" "{{caxa}}/node_modules/ironfish/bin/run"
6564
echo "RELEASE_NAME=ironfish-${{ matrix.settings.system }}-${{ matrix.settings.arch }}-${{ github.event.release.tag_name }}.zip"
66-
65+
6766
- name: set paths
6867
id: set_paths
6968
shell: bash

Cargo.lock

Lines changed: 21 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)