From cc91216b306f5f63f85bca5d0f89f4e99cad9dbf Mon Sep 17 00:00:00 2001
From: Nicco Kunzmann <niccokunzmann@rambler.ru>
Date: Thu, 6 Feb 2025 14:27:18 +0000
Subject: [PATCH 1/4] build on arm runners

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8597a1d8..57011aa0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,6 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
+        platform: ["ubuntu-24.04-arm", "ubuntu-24.04"]
         postgres: [13, 14, 15, 16, 17]
         postgis: ['3.5']
         variant: [default, alpine]
@@ -27,7 +28,7 @@ jobs:
             variant: default
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.platform }}
     continue-on-error: ${{ matrix.postgis == 'master' }}
     env:
       VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}

From a8df85100450733046ea94131ffa553b56dda87c Mon Sep 17 00:00:00 2001
From: Nicco Kunzmann <niccokunzmann@rambler.ru>
Date: Thu, 6 Feb 2025 14:32:39 +0000
Subject: [PATCH 2/4] Use os in matrix

see https://docs.github.com/de/actions/writing-workflows/choosing-what-your-workflow-does/running-variations-of-jobs-in-a-workflow
---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57011aa0..14f38509 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        platform: ["ubuntu-24.04-arm", "ubuntu-24.04"]
+        os: ["ubuntu-24.04-arm", "ubuntu-24.04"]
         postgres: [13, 14, 15, 16, 17]
         postgis: ['3.5']
         variant: [default, alpine]
@@ -27,8 +27,8 @@ jobs:
             postgis: master
             variant: default
 
-    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
-    runs-on: ${{ matrix.platform }}
+    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.postgis == 'master' }}
     env:
       VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}

From 8e0f29cfec73595ef2984c74563451deb4879bed Mon Sep 17 00:00:00 2001
From: Nicco Kunzmann <niccokunzmann@rambler.ru>
Date: Thu, 6 Feb 2025 14:34:09 +0000
Subject: [PATCH 3/4] Add default os to includes

---
 .github/workflows/main.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14f38509..1c6304e4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,9 +23,19 @@ jobs:
           - postgres: 16
             postgis: master
             variant: default
+            os: "ubuntu-24.04"
+          - postgres: 16
+            postgis: master
+            variant: default
+            os: "ubuntu-24.04-arm"
+          - postgres: 17
+            postgis: master
+            variant: default
+            os: "ubuntu-24.04"
           - postgres: 17
             postgis: master
             variant: default
+            os: "ubuntu-24.04-arm"
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}

From 6c1348c7ec91f0dda8a6c50c91652e3a0c50e871 Mon Sep 17 00:00:00 2001
From: Nicco Kunzmann <niccokunzmann@rambler.ru>
Date: Thu, 6 Feb 2025 14:34:57 +0000
Subject: [PATCH 4/4] correct name

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1c6304e4..ae497db3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
             variant: default
             os: "ubuntu-24.04-arm"
 
-    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.platform }}
+    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.postgis == 'master' }}
     env: