From a980ab14a0db9dea9ca016425df8dd8e2ae59f0b Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 3 Dec 2021 15:56:56 +0100
Subject: ci: re-enable macos

They have libstrophe 0.11.0 now.
This reverts commit 472a3ceec4ce4bd018d7276372cf3ccdc24b76c9.
---
 .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 c40cf4b0..ebcc86d6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,15 +22,15 @@ 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
-- 
cgit 1.4.1-2-gfad0


From d6633e092092f6c1355dde0035fdeadf1b0bf4c9 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 3 Dec 2021 16:14:26 +0100
Subject: ci: re-enable ubuntu

This reverts commit cc206ee8cc2cf8458325337f2e68b0dd11b95afd.
---
 .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 ebcc86d6..a6e2693a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        flavor: [debian, fedora]
+        flavor: [debian, fedora, ubuntu]
 
     name: Linux
     steps:
-- 
cgit 1.4.1-2-gfad0


From 8b53acd608033e3909c3d990b5a1d8a83396c53b Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 3 Dec 2021 16:15:04 +0100
Subject: ci: update ubuntu python package names

---
 Dockerfile.ubuntu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 840cd736..9686084f 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -26,7 +26,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxss-dev \
   make \
   pkg-config \
-  python-dev \
+  python3-dev \
+  python-dev-is-python3 \
   libsqlite3-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
-- 
cgit 1.4.1-2-gfad0


From 05435d27142bffe226113d6d2f3f643cb711bada Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 3 Dec 2021 16:17:40 +0100
Subject: ci: re-enable tumblweed

Old docker/libseccomp from GH got updated.

This reverts commit 5c5c45321976c9a859694afa781178c68d076ee2.
---
 .github/workflows/main.yml | 2 +-
 Dockerfile.arch            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a6e2693a..daae84d0 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.arch b/Dockerfile.arch
index a3644b9f..1cd4cd03 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -1,4 +1,4 @@
-FROM archlinux/base
+FROM archlinux/latest
 
 RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   autoconf \
-- 
cgit 1.4.1-2-gfad0