fix merge conflict for v1.6.0

Author: odelcroi

.github/workflows/build.yaml

@@ -264,11 +264,15 @@ jobs:
             type=sha
 
       - name: Setup Cosign
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: sigstore/[email protected]
 =======
         uses: sigstore/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: sigstore/[email protected]
+>>>>>>> Stashed changes
 
       - name: Set up Docker Buildx
         uses: docker/[email protected]
@@ -337,11 +341,15 @@ jobs:
           merge-multiple: true
 
       - name: Prepare a release
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: softprops/[email protected]
 =======
         uses: softprops/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: softprops/[email protected]
+>>>>>>> Stashed changes
         with:
           generate_release_notes: true
           body: |
@@ -410,11 +418,15 @@ jobs:
             await script({ core, github, context });
 
       - name: Update unstable release
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: softprops/[email protected]
 =======
         uses: softprops/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: softprops/[email protected]
+>>>>>>> Stashed changes
         with:
           name: "Unstable build"
           tag_name: unstable

.github/workflows/ci.yaml

@@ -64,11 +64,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22
 
@@ -92,11 +96,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22
 
@@ -120,11 +128,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 20
 

.github/workflows/docs.yaml

@@ -39,11 +39,15 @@ jobs:
           tool: mdbook
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22
 

.github/workflows/release-branch.yaml

@@ -64,11 +64,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22
 

.github/workflows/translations-download.yaml

@@ -22,11 +22,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22
 

.github/workflows/translations-upload.yaml

@@ -21,11 +21,15 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         uses: actions/[email protected]
 =======
         uses: actions/[email protected]
 >>>>>>> v1.6.0
+=======
+        uses: actions/[email protected]
+>>>>>>> Stashed changes
         with:
           node-version: 22