Skip to content

Commit 3161ac8

Browse files
Merge pull request #2380 from swiftwasm/maxd/5.4-pull
Add `swiftwasm-release/5.4` to `pull.yml`
2 parents c853514 + 961e957 commit 3161ac8

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

.github/pull.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ rules:
66
- base: main
77
upstream: apple:main
88
mergeMethod: hardreset
9+
910
- base: release/5.3
1011
upstream: apple:release/5.3
1112
mergeMethod: hardreset
1213
- base: swiftwasm-release/5.3
1314
upstream: release/5.3
1415
mergeMethod: merge
16+
17+
- base: release/5.4
18+
upstream: apple:release/5.4
19+
mergeMethod: hardreset
20+
- base: swiftwasm-release/5.4
21+
upstream: release/5.4
22+
mergeMethod: merge
23+
1524
label: ":arrow_heading_down: Upstream Tracking"

.github/workflows/manual-distribution.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ jobs:
4545
"5.3")
4646
./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.3 5.3 "${{ github.event.inputs.toolchain_name }}"
4747
;;
48+
"5.4")
49+
./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.4 5.4 "${{ github.event.inputs.toolchain_name }}"
50+
;;
4851
*)
4952
echo "Unrecognised release channel: ${{ github.event.inputs.channel }}"
5053
exit 1

.github/workflows/nightly-distribution.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,19 @@ jobs:
3737
DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
3838
DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}
3939
if: github.ref == 'refs/heads/swiftwasm'
40+
4041
- run: ./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.3 5.3
4142
env:
4243
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4344
DARWIN_TOOLCHAIN_APPLICATION_CERT: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT }}
4445
DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
4546
DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
4647
DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}
48+
49+
- run: ./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.4 5.4
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
DARWIN_TOOLCHAIN_APPLICATION_CERT: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT }}
53+
DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
54+
DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
55+
DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}

0 commit comments

Comments
 (0)