From 70a78b28e8a33d8cdc82fa5c70357629a68a29b1 Mon Sep 17 00:00:00 2001
From: Aleksandr Mezin <mezin.alexander@gmail.com>
Date: Thu, 7 Dec 2023 04:29:26 +0200
Subject: [PATCH] [WIP] Switch to meson docker image

---
 .github/workflows/build.yml    | 23 ++++++++++++++++++-----
 .github/workflows/check-po.yml |  2 +-
 .github/workflows/pot.yml      |  2 +-
 .github/workflows/release.yml  |  2 +-
 .github/workflows/test.yml     |  2 +-
 do-in-docker.sh                |  2 +-
 do-in-podman.sh                |  2 +-
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 590438d8b..d02d6ec80 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ddterm/ci-docker-image:2023.12.26.0
+      image: ghcr.io/ddterm/ci-docker-image:meson
 
     steps:
     - name: Checkout
@@ -94,10 +94,6 @@ jobs:
       run: make schemas 2>&1 | tee schemas.log
       if: ${{ always() && steps.checkout.conclusion == 'success' }}
 
-    - name: Validate .desktop file
-      run: make desktop-file-validate 2>&1 | tee desktop-file.log
-      if: ${{ always() && steps.checkout.conclusion == 'success' }}
-
     - name: Validate Gtk .ui files
       run: xvfb-run make gtk-builder-validate 2>&1 | tee gtk-builder.log
       if: ${{ always() && steps.checkout.conclusion == 'success' }}
@@ -122,6 +118,23 @@ jobs:
       run: testspace --verbose eslint.xml "*.log{lint}"
       if: ${{ always() && steps.setup_testspace.outcome == 'success' }}
 
+<<<<<<< HEAD
+=======
+  pack:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/ddterm/ci-docker-image:meson
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - run: git config --global --replace-all safe.directory "$GITHUB_WORKSPACE"
+
+    - name: Enable generic error matcher
+      run: echo "::add-matcher::.github/problem-matchers/generic.json"
+
+>>>>>>> 6b1304f ([WIP] Switch to meson docker image)
     - name: Build extension package
       id: pack
       run: xvfb-run make pack
diff --git a/.github/workflows/check-po.yml b/.github/workflows/check-po.yml
index 11359d617..0f67d0fbc 100644
--- a/.github/workflows/check-po.yml
+++ b/.github/workflows/check-po.yml
@@ -34,7 +34,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ddterm/ci-docker-image:2023.12.26.0
+      image: ghcr.io/ddterm/ci-docker-image:meson
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/pot.yml b/.github/workflows/pot.yml
index 2638ef435..880782287 100644
--- a/.github/workflows/pot.yml
+++ b/.github/workflows/pot.yml
@@ -20,7 +20,7 @@ jobs:
   pot:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ddterm/ci-docker-image:2023.12.26.0
+      image: ghcr.io/ddterm/ci-docker-image:meson
 
     steps:
     - name: Get app token
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af912be61..dedd13a0b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ddterm/ci-docker-image:2023.12.26.0
+      image: ghcr.io/ddterm/ci-docker-image:meson
 
     steps:
     - name: Get app token
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e68c89e0..4db3bde2d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ddterm/ci-docker-image:2023.12.26.0
+      image: ghcr.io/ddterm/ci-docker-image:meson
       options: --privileged --cgroupns=host --tmpfs /tmp --tmpfs /run
 
     strategy:
diff --git a/do-in-docker.sh b/do-in-docker.sh
index ebc2ef80b..12f1bd266 100755
--- a/do-in-docker.sh
+++ b/do-in-docker.sh
@@ -2,7 +2,7 @@
 
 IMAGE=ghcr.io/ddterm/ci-docker-image
 # renovate: datasource=docker depName=ghcr.io/ddterm/ci-docker-image
-IMAGE_VERSION=2023.12.26.0
+IMAGE_VERSION=meson
 
 SCRIPT_REALPATH="$(realpath "$0")"
 SCRIPT_DIR="${SCRIPT_REALPATH%/*}"
diff --git a/do-in-podman.sh b/do-in-podman.sh
index d1bbab314..73dbb40db 100755
--- a/do-in-podman.sh
+++ b/do-in-podman.sh
@@ -2,7 +2,7 @@
 
 IMAGE=ghcr.io/ddterm/ci-docker-image
 # renovate: datasource=docker depName=ghcr.io/ddterm/ci-docker-image
-IMAGE_VERSION=2023.12.26.0
+IMAGE_VERSION=meson
 
 SCRIPT_REALPATH="$(realpath "$0")"
 SCRIPT_DIR="${SCRIPT_REALPATH%/*}"