Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into dAppStaking-Bonus…
Browse files Browse the repository at this point in the history
…-rewards-mechanism-rework-#1379
  • Loading branch information
sylvaincormier committed Nov 24, 2024
2 parents 0e070a7 + d72239b commit 22c081b
Show file tree
Hide file tree
Showing 17 changed files with 1,824 additions and 1,543 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Install deps
run: sudo apt -y install protobuf-compiler
Expand All @@ -40,7 +40,7 @@ jobs:
run: rustup target list --installed

- name: Build EXTRA_ARGS
if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
if: ${{ !startsWith(github.ref, 'refs/tags/runtime') }}
run: |
EXTRA_FLAGS+="--disable-spec-check"
echo "Disabling the spec check since we are not releasing"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
cache: 'yarn'
cache-dependency-path: e2e-tests/yarn.lock

Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/runtime-upgrade-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check permission
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
result-encoding: string
script: |
Expand All @@ -35,7 +35,7 @@ jobs:
steps:
- name: Validate and set inputs
id: test-input
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
result-encoding: string
script: |
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Get branch and sha
id: get-branch-sha
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{secrets.GITHUB_TOKEN}}
result-encoding: string
Expand All @@ -89,7 +89,7 @@ jobs:
core.setOutput("sha", pull_request.data.head.sha)
- name: Post starting comment
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
MESSAGE: |
Runtime upgrade test is scheduled at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
Expand Down Expand Up @@ -126,6 +126,13 @@ jobs:
- name: Build runtime
run: cargo build -p ${{ steps.test-input.outputs.runtime }}-runtime --release --locked

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'yarn'
cache-dependency-path: tests/e2e/yarn.lock

- name: Run runtime upgrade test
id: test
run: |
Expand All @@ -134,7 +141,7 @@ jobs:
yarn test:runtime-upgrade-${{ steps.test-input.outputs.runtime }} > ${{runner.temp}}/out.txt
- name: Post result comment
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
MESSAGE: |
Runtime upgrade test finished:
Expand Down
6 changes: 6 additions & 0 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 22c081b

Please sign in to comment.