Skip to content

Commit 5933c12

Browse files
authored
Merge branch 'master' into hasher_trait_for_pallet_beefy
2 parents 56dac31 + cadf3ac commit 5933c12

File tree

186 files changed

+3401
-1133
lines changed

Some content is hidden

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

186 files changed

+3401
-1133
lines changed

.github/actions/build-push-image/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ runs:
6464
env:
6565
GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
6666
run: |
67-
export DOCKER_IMAGES_VERSION=${{ github.event.pull_request.head.sha || 'master' }}
6867
export DOCKERHUB_TAG=docker.io/paritypr/${{ inputs.image-name }}:${{ github.event.pull_request.number || 'master' }}
6968
if [[ ${{ github.event_name }} == "pull_request" ]]; then export DOCKERHUB_TAG=$DOCKERHUB_TAG-${GITHUB_PR_HEAD_SHA::8}; fi
69+
if [[ ${{ github.event_name }} == "push" ]]; then export DOCKERHUB_TAG=$DOCKERHUB_TAG-${GITHUB_SHA::8}; fi
7070
#
71-
docker tag "europe-docker.pkg.dev/parity-ci-2024/temp-images/${{ inputs.image-name }}:$DOCKER_IMAGES_VERSION" $DOCKERHUB_TAG
71+
docker tag "europe-docker.pkg.dev/parity-ci-2024/temp-images/${{ inputs.image-name }}:${{ github.event.pull_request.head.sha || 'master' }}" $DOCKERHUB_TAG
7272
docker push $DOCKERHUB_TAG
7373
7474

.github/scripts/release/build-linux-release.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99

1010
BIN=$1
1111
PACKAGE=${2:-$BIN}
12+
# must be given as feature1,feature2,feature3...
13+
FEATURES=$3
14+
if [ -n "$FEATURES" ]; then
15+
FEATURES="--features ${FEATURES}"
16+
fi
1217

1318
PROFILE=${PROFILE:-production}
1419
ARTIFACTS=/artifacts/$BIN
@@ -17,7 +22,7 @@ echo "Artifacts will be copied into $ARTIFACTS"
1722
mkdir -p "$ARTIFACTS"
1823

1924
git log --pretty=oneline -n 1
20-
time cargo build --profile $PROFILE --locked --verbose --bin $BIN --package $PACKAGE
25+
time cargo build --profile $PROFILE --locked --verbose --bin $BIN --package $PACKAGE $FEATURES
2126

2227
echo "Artifact target: $ARTIFACTS"
2328

.github/scripts/release/build-macos-release.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ PROFILE=${PROFILE:-production}
1414
# write, so make it relative to github workspace.
1515
ARTIFACTS=$GITHUB_WORKSPACE/artifacts/$BIN
1616
VERSION=$(git tag -l --contains HEAD | grep -E "^v.*")
17+
# must be given as feature1,feature2,feature3...
18+
FEATURES=$3
19+
if [ -n "$FEATURES" ]; then
20+
FEATURES="--features ${FEATURES}"
21+
fi
1722

1823
echo "Artifacts will be copied into $ARTIFACTS"
1924
mkdir -p "$ARTIFACTS"
2025

2126
git log --pretty=oneline -n 1
22-
time cargo build --profile $PROFILE --locked --verbose --bin $BIN --package $PACKAGE
27+
time cargo build --profile $PROFILE --locked --verbose --bin $BIN --package $PACKAGE $FEATURES
2328

2429
echo "Artifact target: $ARTIFACTS"
2530

.github/workflows/bench-all-runtimes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
path: patches
134134

135135
# needs to be able to trigger CI
136-
- uses: actions/create-github-app-token@v1
136+
- uses: actions/create-github-app-token@v2
137137
id: generate_token
138138
with:
139139
app-id: ${{ secrets.CMD_BOT_APP_ID }}

.github/workflows/benchmarks-networking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
git config --global --add safe.directory '*'
8181
ls -lsR ./charts
8282
83-
- uses: actions/create-github-app-token@v1
83+
- uses: actions/create-github-app-token@v2
8484
id: app-token
8585
with:
8686
app-id: ${{ secrets.POLKADOTSDK_GHPAGES_APP_ID }}

.github/workflows/benchmarks-subsystem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
git config --global --add safe.directory '*'
9797
ls -lsR ./charts
9898
99-
- uses: actions/create-github-app-token@v1
99+
- uses: actions/create-github-app-token@v2
100100
id: app-token
101101
with:
102102
app-id: ${{ secrets.POLKADOTSDK_GHPAGES_APP_ID }}

.github/workflows/check-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.0 (22. Sep 2023)
3737

3838
- name: Lychee link checker
39-
uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # for v1.9.1 (10. Jan 2024)
39+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # for v1.9.1 (10. Jan 2024)
4040
with:
4141
args: >-
4242
--config .config/lychee.toml

.github/workflows/check-semver.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
- name: Rust Cache
7373
if: ${{ !contains(github.event.pull_request.labels.*.name, 'R0-silent') }}
74-
uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
74+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
7575
with:
7676
cache-on-failure: true
7777

.github/workflows/checks-quick.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ jobs:
220220
echo "RUST_VERSION=${RUST_VERSION}" >> $GITHUB_ENV
221221
222222
- name: Install Rust
223-
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
223+
uses: actions-rust-lang/setup-rust-toolchain@9d7e65c320fdb52dcd45ffaa68deb6c02c8754d9 # v1.12.0
224224
with:
225225
cache: false
226226
toolchain: ${{ env.RUST_VERSION }}

.github/workflows/cmd-run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275
runs-on: ubuntu-latest
276276
steps:
277277
# needs to be able to trigger CI, as default token does not retrigger
278-
- uses: actions/create-github-app-token@v1
278+
- uses: actions/create-github-app-token@v2
279279
id: generate_token
280280
with:
281281
app-id: ${{ secrets.CMD_BOT_APP_ID }}

0 commit comments

Comments
 (0)