Skip to content

Commit abfa588

Browse files
committed
Merge tag '1.25.7-kintsugi' into kintsugi/ahm-backport
2 parents aec16bb + f8468c7 commit abfa588

4 files changed

Lines changed: 32 additions & 21 deletions

File tree

.github/workflows/draft-release.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Publish draft release
33
on:
44
push:
55
tags:
6-
- "v[0-9]+.[0-9]+.[0-9]+.*"
7-
- "[0-9]+.[0-9]+.[0-9]+.*"
6+
- "*"
7+
workflow_dispatch:
88

99
jobs:
1010
build-runtimes:
11-
runs-on: [self-hosted, linux]
11+
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
1414
runtime: ["interlay", "kintsugi"]
@@ -18,14 +18,11 @@ jobs:
1818

1919
- name: Build ${{ matrix.runtime }} runtime
2020
id: srtool_build
21-
uses: chevdor/srtool-actions@v0.9.2
21+
uses: paritytech/srtool-actions@v0.9.3
2222
with:
23-
image: docker.io/interlayhq/srtool
24-
tag: nightly-2022-12-15
2523
package: ${{ matrix.runtime }}-runtime-parachain
26-
runtime_dir: ./parachain/runtime/${{ matrix.runtime }}
24+
runtime_dir: parachain/runtime/${{ matrix.runtime }}
2725
chain: ${{ matrix.runtime }}
28-
workdir: ${{ github.workspace }}
2926
- name: Store srtool digest to disk
3027
run: |
3128
echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json
@@ -91,7 +88,7 @@ jobs:
9188
- name: Available platforms
9289
run: echo ${{ steps.buildx.outputs.platforms }}
9390
- name: Login to Dockerhub
94-
uses: docker/login-action@v2
91+
uses: docker/login-action@v3
9592
with:
9693
username: ${{ secrets.DOCKERHUB_USERNAME }}
9794
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -122,7 +119,7 @@ jobs:
122119
platforms: linux/amd64
123120

124121
publish-draft-release:
125-
runs-on: [self-hosted, linux]
122+
runs-on: ubuntu-latest
126123
needs: ["build-runtimes", "build-binary"]
127124
steps:
128125
- name: Checkout
@@ -133,6 +130,7 @@ jobs:
133130
- uses: actions/download-artifact@v4
134131
with:
135132
path: artifacts
133+
pattern: "!*.dockerbuild"
136134

137135
- run: |
138136
find ./artifacts

Cargo.lock

Lines changed: 16 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "nightly-2023-03-01"
3+
components = [ "rustfmt", "rls" ]
4+
targets = [ "wasm32-unknown-unknown" ]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "nightly-2023-03-01"
3+
components = [ "rustfmt", "rls" ]
4+
targets = [ "wasm32-unknown-unknown" ]

0 commit comments

Comments
 (0)