Skip to content

Commit e27a127

Browse files
authored
Merge pull request #4021 from iron-fish/staging
STAGING -> MASTER
2 parents 1ccdf95 + 7f35ed2 commit e27a127

File tree

146 files changed

+16390
-869
lines changed

Some content is hidden

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

146 files changed

+16390
-869
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ jobs:
3939
name: Build ${{ matrix.settings.target }}
4040
runs-on: ${{ matrix.settings.host }}
4141
steps:
42+
- name: Record CPU information
43+
run: |
44+
${{ contains(matrix.settings.host, 'ubuntu-') && 'cat /proc/cpuinfo' || '' }}
45+
${{ contains(matrix.settings.host, 'macos-') && 'sysctl -a | grep machdep.cpu' || '' }}
46+
${{ contains(matrix.settings.host, 'windows-') && 'Get-WmiObject -Class Win32_Processor -ComputerName.' || '' }}
47+
4248
- name: Check out Git repository
4349
uses: actions/checkout@v3
4450

.github/workflows/check-pr-branch.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Pull Requests should target Staging branch
2+
3+
on:
4+
pull_request:
5+
types: ['*']
6+
branches:
7+
- '**'
8+
9+
jobs:
10+
check:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- if: ${{ contains(github.event.pull_request.base.ref, 'master') && !contains(github.event.pull_request.title, 'master') }}
14+
run: |
15+
echo 'Pull request has "master" base branch without the override keyword "master" in the PR Title'
16+
echo 'This pull request probably meant to target "staging"'
17+
exit 1

.github/workflows/ci.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ jobs:
6464
- name: Run tests
6565
run: yarn test:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
6666

67+
- name: Check for missing fixtures
68+
run: |
69+
if [[ $(git status | grep fixture) ]]; then
70+
echo "New test fixtures have not been checked in, please check them in."
71+
exit 1
72+
fi
73+
6774
- name: Upload coverage
6875
if: github.repository == 'iron-fish/ironfish'
6976
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload
@@ -93,9 +100,13 @@ jobs:
93100
- name: Run slow tests & coverage
94101
run: yarn test:slow:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
95102

96-
- name: Run import/export account tests
97-
run: sudo apt-get update && sudo apt-get install -y expect && yarn build && cd ironfish-cli && yarn test:importexport
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
98109
99110
- name: Upload coverage
100111
if: github.repository == 'iron-fish/ironfish'
101-
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload
112+
run: CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ROOT_PATH=$GITHUB_WORKSPACE/ yarn coverage:upload

.github/workflows/perf_test.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Performance Tests
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- staging
8+
9+
permissions:
10+
checks: write
11+
contents: write
12+
13+
jobs:
14+
testperf:
15+
name: Perf Tests
16+
runs-on: [self-hosted, macOS, ARM64]
17+
18+
steps:
19+
- name: Check out Git repository
20+
uses: actions/checkout@v3
21+
with:
22+
ref: ${{ github.ref }}
23+
24+
- name: Use Node.js
25+
uses: actions/setup-node@v3
26+
with:
27+
node-version: '18.12.1'
28+
cache: 'yarn'
29+
30+
- name: Install packages
31+
run: yarn --non-interactive --frozen-lockfile
32+
33+
- name: Run perf tests
34+
run: yarn test:perf:report
35+
36+
- name: Check for missing fixtures
37+
run: |
38+
if [[ $(git status | grep fixture) ]]; then
39+
echo "New test fixtures have not been checked in, please check them in."
40+
exit 1
41+
fi
42+
43+
- name: Import to InfluxDB
44+
if: contains(github.event_name, 'push')
45+
env:
46+
INFLUX_TOKEN: ${{ secrets.INFLUX_TOKEN }}
47+
INFLUX_ORG: 'fdcfe96f6c31245a'
48+
INFLUX_HOST: 'https://us-east-1-1.aws.cloud2.influxdata.com'
49+
run: |
50+
for f in ironfish/test-reports/*.perf.csv; do
51+
influx write --bucket ironfish-telemetry-mainnet --format=csv --file $f
52+
done

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# testing
77
**/coverage
88
testdbs
9+
**/test-reports
910

1011
# production
1112
**/build

0 commit comments

Comments
 (0)