aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

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

Browse Source 
Re-enable Tumbleweed and MacOS ci
This commit is contained in:
Michael Vetter 2022-08-18 15:20:44 +02:00 committed by GitHub
commit 0864bc68d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/main.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
flavor: [debian, fedora, ubuntu] flavor: [debian, fedora, tumbleweed, ubuntu]
name: Linux name: Linux
steps: steps:
@ -22,18 +22,18 @@ jobs:
docker build -f Dockerfile.${{ matrix.flavor }} -t profanity . docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
docker run profanity ./ci-build.sh docker run profanity ./ci-build.sh
# macos: macos:
# runs-on: macos-latest runs-on: macos-latest
# name: macOS name: macOS
# steps: steps:
# - uses: actions/checkout@v2 - uses: actions/checkout@v2
# - name: Run brew bundle - name: Run brew bundle
# run: brew bundle run: brew bundle
# - name: Run tests - name: Run tests
# env: env:
# # Ensure that "keg-only" Homebrew versions are used. # 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" 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 run: ./ci-build.sh
code-style: code-style:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04

2
Dockerfile.fedora
View File

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

6
Dockerfile.tumbleweed
View File

@ -29,10 +29,8 @@ RUN zypper --non-interactive in --no-recommends \
libuuid-devel \ libuuid-devel \
make \ make \
ncurses-devel \ ncurses-devel \
python \ python310 \
python-devel \ python310-devel \
python38 \
python38-devel \
readline-devel \ readline-devel \
sqlite3-devel \ sqlite3-devel \
gdk-pixbuf-devel \ gdk-pixbuf-devel \