From 8f2f0edf7a931e3200acfc3556a05b7088837293 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Tue, 9 Aug 2022 13:37:40 +0200
Subject: [PATCH 1/3] ci: enable macos ci

This reverts commit d5bb93b9271578979dc6109b1007676fc5e8578a.
---
 .github/workflows/main.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index edf1cc57..6a9e439f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,18 +22,18 @@ jobs:
           docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
           docker run profanity ./ci-build.sh
 
-#  macos:
-#    runs-on: macos-latest
-#    name: macOS
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Run brew bundle
-#        run: brew bundle
-#      - name: Run tests
-#        env:
-#          # Ensure that "keg-only" Homebrew versions are used.
-#          PKG_CONFIG_PATH: "/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig:/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/sqlite/lib/pkgconfig:$PKG_CONFIG_PATH"
-#        run: ./ci-build.sh
+  macos:
+    runs-on: macos-latest
+    name: macOS
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run brew bundle
+        run: brew bundle
+      - name: Run tests
+        env:
+          # Ensure that "keg-only" Homebrew versions are used.
+          PKG_CONFIG_PATH: "/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig:/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/sqlite/lib/pkgconfig:$PKG_CONFIG_PATH"
+        run: ./ci-build.sh
 
   code-style:
     runs-on: ubuntu-20.04

From cdebb559bba34ab68446a95eb9de481601279cd3 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Tue, 9 Aug 2022 13:38:21 +0200
Subject: [PATCH 2/3] ci: enable tumbleweed

This reverts commit 5c5c45321976c9a859694afa781178c68d076ee2.

And removes the old python(2) pull in.

For some reason we get:
`Package python3-embed was not found in the pkg-config search path.`
with python38-devel but not with python310-devel. Let's bump it to that
version.
---
 .github/workflows/main.yml | 2 +-
 Dockerfile.tumbleweed      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6a9e439f..dc73b14b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        flavor: [debian, fedora, ubuntu]
+        flavor: [debian, fedora, tumbleweed, ubuntu]
 
     name: Linux
     steps:
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 5fc134dc..5cd6c20c 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -29,10 +29,8 @@ RUN zypper --non-interactive in --no-recommends \
   libuuid-devel \
   make \
   ncurses-devel \
-  python \
-  python-devel \
-  python38 \
-  python38-devel \
+  python310 \
+  python310-devel \
   readline-devel \
   sqlite3-devel \
   gdk-pixbuf-devel \

From dba9f3f82109220a15a3014ae29b65179a46670a Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 18 Aug 2022 15:03:38 +0200
Subject: [PATCH 3/3] ci: fedora - remove python2

---
 Dockerfile.fedora | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index b885bebb..effefc5c 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -28,8 +28,6 @@ RUN dnf install -y \
   libuuid-devel \
   make \
   ncurses-devel \
-  python \
-  python-devel \
   python3 \
   python3-devel \
   readline-devel \