From af7431ef9e673798b98c5e5e82fcd7b70ddbef24 Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 19:29:02 +0100
Subject: [PATCH 1/2] actions/checkout@v3

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/merge.yml   | 5 ++---
 .github/workflows/release.yml | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af195cd4c..e282ff5a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU for aarch64 emulation
         if: ${{ matrix.arch != 'x86_64' }}
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint
         run: io.elementary.vala-lint -d .
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 4e2811c53..41bc446bf 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -1,5 +1,4 @@
 ---
-
 name: Merge
 
 on:
@@ -24,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU for aarch64 emulation
         if: ${{ matrix.arch != 'x86_64' }}
@@ -57,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Gettext
         uses: elementary/actions/gettext-template@master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index abdf09137..e96ea06ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
 
      steps:
        - name: Checkout
-         uses: actions/checkout@v2
+         uses: actions/checkout@v3
 
        - name: Release
          uses: elementary/actions/release@master
@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU for aarch64 emulation
         if: ${{ matrix.arch != 'x86_64' }}

From 9b32921ba90c68e8e6908cf274da87312c6cbf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 9 Jan 2023 15:27:02 -0800
Subject: [PATCH 2/2] Update merge.yml

---
 .github/workflows/merge.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 41bc446bf..e69d588bd 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -52,15 +52,24 @@ jobs:
 
   gettext:
     name: Gettext
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    container:
+      image: elementary/docker:next-unstable
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+    - name: Install git
+      run: |
+        apt-get update
+        apt-get install git -y
+
+    - name: Clone repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.GIT_USER_TOKEN }}
 
-      - name: Gettext
-        uses: elementary/actions/gettext-template@master
-        env:
-          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
-          GIT_USER_NAME: "elementaryBot"
-          GIT_USER_EMAIL: "builds@elementary.io"
+    - name: Update Translation Files
+      uses: elementary/actions/gettext-template@next
+      env:
+        GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
+        GIT_USER_NAME: "elementaryBot"
+        GIT_USER_EMAIL: "builds@elementary.io"