diff options
| -rw-r--r-- | .github/workflows/main.yml | 26 | ||||
| -rw-r--r-- | Dockerfile.arch | 2 | ||||
| -rw-r--r-- | Dockerfile.ubuntu | 3 |
3 files changed, 16 insertions, 15 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c40cf4b0..daae84d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - flavor: [debian, fedora] + flavor: [debian, fedora, tumbleweed, ubuntu] name: Linux steps: @@ -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 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 \ 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} |