Merge pull request #1747 from profanity-im/ci-test

Re-enable Tumbleweed and MacOS ci

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        flavor: [debian, fedora, ubuntu]
+        flavor: [debian, fedora, tumbleweed, ubuntu]
 
     name: Linux
     steps:
@@ -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

Dockerfile.fedora

@@ -28,8 +28,6 @@ RUN dnf install -y \
   libuuid-devel \
   make \
   ncurses-devel \
-  python \
-  python-devel \
   python3 \
   python3-devel \
   readline-devel \

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 \