Skip to content

Commit 4c67ac8

Browse files
committed
Merge tag 'v1.6.0' into upgrade/mas-v1.6.0
with conflict 1.6.0
2 parents df10107 + 3dd362a commit 4c67ac8

File tree

186 files changed

+14702
-2612
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

+14702
-2612
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @element-hq/mas-maintainers

.github/workflows/build.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,11 @@ jobs:
264264
type=sha
265265
266266
- name: Setup Cosign
267+
<<<<<<< HEAD
267268
uses: sigstore/[email protected]
269+
=======
270+
uses: sigstore/[email protected]
271+
>>>>>>> v1.6.0
268272

269273
- name: Set up Docker Buildx
270274
uses: docker/[email protected]
@@ -274,7 +278,7 @@ jobs:
274278
mirrors = ["mirror.gcr.io"]
275279
276280
- name: Login to GitHub Container Registry
277-
uses: docker/login-action@v3.5.0
281+
uses: docker/login-action@v3.6.0
278282
with:
279283
registry: ghcr.io
280284
username: ${{ github.repository_owner }}
@@ -333,7 +337,11 @@ jobs:
333337
merge-multiple: true
334338

335339
- name: Prepare a release
340+
<<<<<<< HEAD
336341
uses: softprops/[email protected]
342+
=======
343+
uses: softprops/[email protected]
344+
>>>>>>> v1.6.0
337345
with:
338346
generate_release_notes: true
339347
body: |
@@ -402,7 +410,11 @@ jobs:
402410
await script({ core, github, context });
403411
404412
- name: Update unstable release
413+
<<<<<<< HEAD
405414
uses: softprops/[email protected]
415+
=======
416+
uses: softprops/[email protected]
417+
>>>>>>> v1.6.0
406418
with:
407419
name: "Unstable build"
408420
tag_name: unstable

.github/workflows/ci.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ jobs:
6464
uses: actions/checkout@v5
6565

6666
- name: Install Node
67+
<<<<<<< HEAD
6768
uses: actions/[email protected]
69+
=======
70+
uses: actions/[email protected]
71+
>>>>>>> v1.6.0
6872
with:
6973
node-version: 22
7074

@@ -88,7 +92,11 @@ jobs:
8892
uses: actions/checkout@v5
8993

9094
- name: Install Node
95+
<<<<<<< HEAD
9196
uses: actions/[email protected]
97+
=======
98+
uses: actions/[email protected]
99+
>>>>>>> v1.6.0
92100
with:
93101
node-version: 22
94102

@@ -112,7 +120,11 @@ jobs:
112120
uses: actions/checkout@v5
113121

114122
- name: Install Node
123+
<<<<<<< HEAD
115124
uses: actions/[email protected]
125+
=======
126+
uses: actions/[email protected]
127+
>>>>>>> v1.6.0
116128
with:
117129
node-version: 20
118130

.github/workflows/docs.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ jobs:
3939
tool: mdbook
4040

4141
- name: Install Node
42+
<<<<<<< HEAD
4243
uses: actions/[email protected]
44+
=======
45+
uses: actions/[email protected]
46+
>>>>>>> v1.6.0
4347
with:
4448
node-version: 22
4549

.github/workflows/release-branch.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ jobs:
6464
uses: actions/checkout@v5
6565

6666
- name: Install Node
67+
<<<<<<< HEAD
6768
uses: actions/[email protected]
69+
=======
70+
uses: actions/[email protected]
71+
>>>>>>> v1.6.0
6872
with:
6973
node-version: 22
7074

.github/workflows/translations-download.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ jobs:
2222
uses: actions/checkout@v5
2323

2424
- name: Install Node
25+
<<<<<<< HEAD
2526
uses: actions/[email protected]
27+
=======
28+
uses: actions/[email protected]
29+
>>>>>>> v1.6.0
2630
with:
2731
node-version: 22
2832

.github/workflows/translations-upload.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ jobs:
2121
uses: actions/checkout@v5
2222

2323
- name: Install Node
24+
<<<<<<< HEAD
2425
uses: actions/[email protected]
26+
=======
27+
uses: actions/[email protected]
28+
>>>>>>> v1.6.0
2529
with:
2630
node-version: 22
2731

0 commit comments

Comments
 (0)