Skip to content

Commit 0bbc59a

Browse files
authored
Merge branch 'main' into quenting/shutdown-on-crash
2 parents 414fe21 + 7d6e455 commit 0bbc59a

File tree

14 files changed

+331
-108
lines changed

14 files changed

+331
-108
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
aarch64-unknown-linux-gnu
5454
5555
- name: Setup sccache
56-
uses: mozilla-actions/[email protected].6
56+
uses: mozilla-actions/[email protected].7
5757

5858
- name: Install zig
5959
uses: goto-bus-stop/setup-zig@v2

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
rustup default stable
151151
152152
- name: Setup sccache
153-
uses: mozilla-actions/[email protected].6
153+
uses: mozilla-actions/[email protected].7
154154

155155
- name: Install Node
156156
uses: actions/[email protected]
@@ -209,7 +209,7 @@ jobs:
209209
run: make
210210

211211
- name: Setup sccache
212-
uses: mozilla-actions/[email protected].6
212+
uses: mozilla-actions/[email protected].7
213213

214214
- name: Run clippy
215215
run: |
@@ -236,7 +236,7 @@ jobs:
236236
uses: taiki-e/install-action@nextest
237237

238238
- name: Setup sccache
239-
uses: mozilla-actions/[email protected].6
239+
uses: mozilla-actions/[email protected].7
240240

241241
- name: Build and archive tests
242242
run: cargo nextest archive --workspace --archive-file nextest-archive.tar.zst

.github/workflows/coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
run: make
140140

141141
- name: Setup sccache
142-
uses: mozilla-actions/[email protected].6
142+
uses: mozilla-actions/[email protected].7
143143

144144
- name: Download grcov
145145
run: |

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
rustup default stable
2929
3030
- name: Setup sccache
31-
uses: mozilla-actions/[email protected].6
31+
uses: mozilla-actions/[email protected].7
3232

3333
- name: Setup mdBook
3434
uses: peaceiris/[email protected]

.github/workflows/release.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
env:
6262
VERSION: ${{ steps.next.outputs.version }}
6363
with:
64-
result-encoding: string
6564
# Commit & tag with the actions token, so that they get signed
65+
# This returns the commit sha and the tag object sha
6666
script: |
6767
const fs = require("fs/promises");
6868
const [owner, repo] = process.env.GITHUB_REPOSITORY.split("/");
@@ -122,27 +122,29 @@ jobs:
122122
});
123123
console.log("Created tag:", tag.data.url);
124124
125-
return commit.data.sha;
125+
return { commit: commit.data.sha, tag: tag.data.sha };
126126
127127
- name: Update the refs
128128
uses: actions/[email protected]
129129
env:
130130
VERSION: ${{ steps.next.outputs.version }}
131-
COMMIT: ${{ steps.commit.outputs.result }}
131+
TAG_SHA: ${{ fromJSON(steps.commit.outputs.result).tag }}
132+
COMMIT_SHA: ${{ fromJSON(steps.commit.outputs.result).commit }}
132133
with:
133134
# Update the refs with the bot token, so that workflows are triggered
134135
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
135136
script: |
136137
const [owner, repo] = process.env.GITHUB_REPOSITORY.split("/");
137138
const version = process.env.VERSION;
138-
const commit = process.env.COMMIT;
139+
const commit = process.env.COMMIT_SHA;
140+
const tag = process.env.TAG_SHA;
139141
const branch = process.env.GITHUB_REF_NAME;
140142
141143
const tag = await github.rest.git.createRef({
142144
owner,
143145
repo,
144146
ref: `refs/tags/v${version}`,
145-
sha: commit,
147+
sha: tag,
146148
});
147149
console.log("Created tag ref:", tag.data.url);
148150

.github/workflows/translations-download.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
download:
1010
runs-on: ubuntu-22.04
1111
permissions:
12-
contents: read
12+
contents: write
1313

1414
steps:
1515
- name: Checkout the code
@@ -23,17 +23,22 @@ jobs:
2323

2424
- name: Create Pull Request
2525
id: cpr
26-
uses: peter-evans/create-pull-request@v6.1.0
26+
uses: peter-evans/create-pull-request@v7.0.5
2727
with:
28+
sign-commits: true
2829
token: ${{ secrets.BOT_GITHUB_TOKEN }}
30+
branch-token: ${{ secrets.GITHUB_TOKEN }}
2931
branch: actions/localazy-download
3032
delete-branch: true
31-
title: Localazy Download
33+
title: Translations updates
34+
labels: |
35+
T-Task
36+
A-I18n
3237
commit-message: Translations updates
3338

3439
- name: Enable automerge
3540
run: gh pr merge --merge --auto "$PR_NUMBER"
3641
if: steps.cpr.outputs.pull-request-operation == 'created'
3742
env:
3843
GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
39-
PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}
44+
PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}

0 commit comments

Comments
 (0)