Skip to content

Commit

Permalink
Merge pull request iron-fish#4430 from iron-fish/staging
Browse files Browse the repository at this point in the history
STAGING -> MASTER
  • Loading branch information
danield9tqh authored Nov 6, 2023
2 parents 246e55d + fa0736c commit 3b61ff3
Show file tree
Hide file tree
Showing 117 changed files with 4,481 additions and 6,223 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-ironfish-rust-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
cache: yarn

- name: Install Rust
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18

- name: Download artifacts
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-regenerate-fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
cache: 'yarn'

- name: Cache Rust
Expand Down
55 changes: 17 additions & 38 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
cache: 'yarn'

- name: Install packages
Expand All @@ -39,9 +39,13 @@ jobs:
- name: Lint
run: yarn lint

test:
name: Test
test-matrix:
name: Test Matrix
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20]
test-type: ["test", "test:slow"]

steps:
- name: Check out Git repository
Expand All @@ -50,7 +54,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: ${{ matrix.version }}
cache: 'yarn'

- name: Cache Rust
Expand All @@ -62,7 +66,7 @@ jobs:
run: yarn --non-interactive --frozen-lockfile

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

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

testslow:
name: Slow Tests
# This is a workaround to have status checks on jobs that use a matrix.
# See: https://github.com/orgs/community/discussions/26822
test:
if: ${{ always() }}
runs-on: ubuntu-latest

name: Test
needs: [test-matrix]
steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
cache: 'yarn'

- name: Cache Rust
uses: Swatinem/rust-cache@v2
with:
shared-key: nodejs

- name: Install packages
run: yarn --non-interactive --frozen-lockfile

- name: Run slow tests & coverage
run: yarn test:slow:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB

- name: Check for missing fixtures
run: |
if [[ $(git status | grep fixture) ]]; then
echo "New test fixtures have not been checked in, please check them in."
exit 1
fi
- name: Upload coverage
if: github.repository == 'iron-fish/ironfish'
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload
- run: exit 1
if: ${{ !contains(needs.*.result, 'success')}}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-brew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
cache: 'yarn'

- name: Build Ironfish CLI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
registry-url: 'https://registry.npmjs.org'
cache: yarn

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish-rust-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
registry-url: 'https://registry.npmjs.org'
cache: yarn

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
registry-url: 'https://registry.npmjs.org'
cache: yarn

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18
cache: 'yarn'

- name: Install packages
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/publish-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- host: ubuntu-20.04
arch: x86_64
system: linux

- host: [self-hosted, macOS, ARM64]
arch: arm64
system: apple
Expand All @@ -32,7 +32,6 @@ jobs:
# - host: ubuntu-20.04
# arch: aarch64
# system: linux


# - host: ubuntu-20.04
# target: aarch64-apple-darwin
Expand All @@ -50,11 +49,11 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.12.1'
node-version: 18

- name: npm init
run: npm init -y

- name: install dependencies
run: npm install ironfish [email protected]

Expand All @@ -63,7 +62,7 @@ jobs:
run: |
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"
echo "RELEASE_NAME=ironfish-${{ matrix.settings.system }}-${{ matrix.settings.arch }}-${{ github.event.release.tag_name }}.zip"
- name: set paths
id: set_paths
shell: bash
Expand Down
96 changes: 21 additions & 75 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3b61ff3

Please sign in to comment.