Merge branch 'master' into danirabbit/default-wayland

elementary · Oct 5, 2024 · 70d0128 · 70d0128
2 parents 0d31265 + c09e7f9
commit 70d0128
Show file tree

Hide file tree

Showing 445 changed files with 3,714 additions and 1,513 deletions.
diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
@@ -5,24 +5,17 @@ on:
     branches: [master]
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/elementary/docker:next-unstable
+  gettext_template:
+    runs-on: ubuntu-latest
 
     steps:
-    - name: Install git
-      run: |
-        apt-get update
-        apt-get install git -y
-
     - name: Clone repository
       uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 
     - name: Update Translation Files
-      uses: elementary/actions/gettext-template@next
+      uses: elementary/actions/gettext-template@main
       env:
         GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
         GIT_USER_NAME: "elementaryBot"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,9 +18,9 @@ jobs:
         version: [stable, unstable, development-target]
         include:
           - version: stable
-            mutter_pkg: libmutter-10-dev
+            mutter_pkg: libmutter-14-dev
           - version: unstable
-            mutter_pkg: libmutter-10-dev
+            mutter_pkg: libmutter-14-dev
           - version: development-target
             mutter_pkg: libmutter-14-dev
     container:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,4 +16,4 @@ jobs:
          GIT_USER_NAME: "elementaryBot"
          GIT_USER_EMAIL: "[email protected]"
        with:
-         release_branch: 'odin'
+         release_branch: 'noble'