about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2022-08-18 15:20:44 +0200
committerGitHub <noreply@github.com>2022-08-18 15:20:44 +0200
commit0864bc68d7037abd41cf75901ffaa0cd8bceb04d (patch)
tree9c69ca61bebef47e73b86f92e60511cec62b8a05
parent712fdc475f9f36527b71c8ca8e4034e57b59f84e (diff)
parentdba9f3f82109220a15a3014ae29b65179a46670a (diff)
downloadprofani-tty-0864bc68d7037abd41cf75901ffaa0cd8bceb04d.tar.gz
Merge pull request #1747 from profanity-im/ci-test
Re-enable Tumbleweed and MacOS ci
-rw-r--r--.github/workflows/main.yml26
-rw-r--r--Dockerfile.fedora2
-rw-r--r--Dockerfile.tumbleweed6
3 files changed, 15 insertions, 19 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index edf1cc57..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:
@@ -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
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 \
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 \