Skip to content

Commit f330b61

Browse files
committed
Merge branch 'master' into tsv-disabling
2 parents 61b8c22 + 1d5d4a4 commit f330b61

File tree

540 files changed

+13888
-8744
lines changed

Some content is hidden

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

540 files changed

+13888
-8744
lines changed

.github/pr-custom-review.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/review-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rules:
99
- ^\.config/nextest.toml
1010
- ^\.cargo/.*
1111
exclude:
12-
- ^./gitlab/pipeline/zombienet.*
12+
- ^\.gitlab/pipeline/zombienet.*
1313
minApprovals: 2
1414
type: basic
1515
teams:

.github/workflows/build-and-attach-release-runtimes.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and Attach Runtimes to Releases/RC
33
on:
44
release:
55
types:
6-
- created
6+
- published
77

88
env:
99
PROFILE: production
@@ -44,12 +44,6 @@ jobs:
4444
runtime_dir: ${{ matrix.runtime.path }}
4545
profile: ${{ env.PROFILE }}
4646

47-
- name: Build Summary
48-
run: |
49-
echo "${{ steps.srtool_build.outputs.json }}" | jq . > ${{ matrix.runtime.name }}-srtool-digest.json
50-
cat ${{ matrix.runtime.name }}-srtool-digest.json
51-
echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
52-
5347
- name: Set up paths and runtime names
5448
id: setup
5549
run: |

.github/workflows/check-publish.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ on:
1010

1111
jobs:
1212
check-publish:
13-
strategy:
14-
matrix:
15-
os: ["ubuntu-latest"]
16-
runs-on: ${{ matrix.os }}
13+
runs-on: ubuntu-latest
1714
steps:
1815
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1916

@@ -23,7 +20,7 @@ jobs:
2320
cache-on-failure: true
2421

2522
- name: install parity-publish
26-
run: cargo install parity-publish --profile dev
23+
run: cargo install parity-publish@0.3.0
2724

2825
- name: parity-publish check
2926
run: parity-publish check --allow-unpublished

.github/workflows/claim-crates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
cache-on-failure: true
1919

2020
- name: install parity-publish
21-
run: cargo install parity-publish@0.2.0
21+
run: cargo install parity-publish@0.3.0
2222

2323
- name: parity-publish claim
2424
env:

.github/workflows/gitspiegel-trigger.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,19 @@ on:
1313
- unlocked
1414
- ready_for_review
1515
- reopened
16+
# the job doesn't check out any code, so it is relatively safe to run it on any event
17+
pull_request_target:
18+
types:
19+
- opened
20+
- synchronize
21+
- unlocked
22+
- ready_for_review
23+
- reopened
1624
merge_group:
1725

26+
# drop all permissions for GITHUB_TOKEN
27+
permissions: {}
28+
1829
jobs:
1930
sync:
2031
runs-on: ubuntu-latest

.github/workflows/merge-queue.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Merge-Queue
2+
3+
on:
4+
merge_group:
5+
6+
jobs:
7+
trigger-merge-queue-action:
8+
runs-on: ubuntu-latest
9+
environment: master
10+
steps:
11+
- name: Generate token
12+
id: app_token
13+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
14+
with:
15+
app_id: ${{ secrets.REVIEW_APP_ID }}
16+
private_key: ${{ secrets.REVIEW_APP_KEY }}
17+
- name: Add Merge Queue status check
18+
uses: billyjbryant/create-status-check@3e6fa0ac599d10d9588cf9516ca4330ef669b858 # v2
19+
with:
20+
authToken: ${{ steps.app_token.outputs.token }}
21+
context: 'review-bot'
22+
description: 'PRs for merge queue gets approved'
23+
state: 'success'
24+
sha: ${{ github.event.merge_group.head_commit.id }}

.github/workflows/pr-custom-review.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/release-50_publish-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ jobs:
268268
269269
- name: Build and push
270270
id: docker_build
271-
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
271+
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
272272
with:
273273
push: true
274274
file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile

.gitlab-ci.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ variables:
3030
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
3131
NEXTEST_FAILURE_OUTPUT: immediate-final
3232
NEXTEST_SUCCESS_OUTPUT: final
33-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.79"
34-
DOCKER_IMAGES_VERSION: "${CI_COMMIT_SHA}"
33+
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
3534

3635
default:
3736
retry:
@@ -70,7 +69,6 @@ default:
7069
.common-before-script:
7170
before_script:
7271
- !reference [.job-switcher, before_script]
73-
- !reference [.timestamp, before_script]
7472
- !reference [.pipeline-stopper-vars, script]
7573

7674
.job-switcher:
@@ -199,9 +197,6 @@ default:
199197
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
200198
- if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
201199

202-
.zombienet-refs:
203-
extends: .build-refs
204-
205200
include:
206201
# check jobs
207202
- .gitlab/pipeline/check.yml
@@ -215,10 +210,6 @@ include:
215210
- .gitlab/pipeline/publish.yml
216211
# zombienet jobs
217212
- .gitlab/pipeline/zombienet.yml
218-
# timestamp handler
219-
- project: parity/infrastructure/ci_cd/shared
220-
ref: v0.2
221-
file: /common/timestamp.yml
222213
# ci image
223214
- project: parity/infrastructure/ci_cd/shared
224215
ref: main

0 commit comments

Comments
 (0)