Merge pull request #2134 from profanity-im/feat/noautotools
feat: Remove autotools and adapt docu and scripts
This commit is contained in:
23
.github/workflows/cygwin-build.yml
vendored
23
.github/workflows/cygwin-build.yml
vendored
@@ -38,6 +38,8 @@ jobs:
|
||||
uses: egor-tensin/setup-cygwin@v4
|
||||
with:
|
||||
packages: >-
|
||||
meson
|
||||
ninja
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
@@ -65,28 +67,15 @@ jobs:
|
||||
./configure --prefix=$PWD/install
|
||||
make -j2 install
|
||||
|
||||
- name: Autotools bootstrap
|
||||
run: |
|
||||
cd "$GITHUB_WORKSPACE"
|
||||
|
||||
# On Windows checkouts the executable bit may be lost and CRLF line endings
|
||||
# can break shell scripts, so normalize bootstrap.sh if it exists.
|
||||
if [ -f ./bootstrap.sh ]; then
|
||||
sed -i 's/\r$//' ./bootstrap.sh
|
||||
chmod +x ./bootstrap.sh
|
||||
./bootstrap.sh
|
||||
else
|
||||
autoreconf -fi
|
||||
fi
|
||||
|
||||
- name: Configure
|
||||
- name: Meson setup
|
||||
env:
|
||||
CC: /usr/bin/gcc
|
||||
PKG_CONFIG_PATH: ${{ github.workspace }}/deps/libstrophe/install/lib/pkgconfig:$PKG_CONFIG_PATH
|
||||
run: |
|
||||
cd "$GITHUB_WORKSPACE"
|
||||
./configure
|
||||
meson setup build_run
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cd "$GITHUB_WORKSPACE"
|
||||
make -j2
|
||||
meson compile -C build_run
|
||||
|
||||
25
.github/workflows/main.yml
vendored
25
.github/workflows/main.yml
vendored
@@ -17,32 +17,23 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- flavor: debian
|
||||
buildsystem: autotools
|
||||
tests: unit
|
||||
omemo: signal
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
- flavor: fedora
|
||||
buildsystem: autotools
|
||||
tests: unit
|
||||
omemo: signal
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
- flavor: ubuntu
|
||||
buildsystem: autotools
|
||||
tests: unit
|
||||
omemo: signal
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
- flavor: debian
|
||||
buildsystem: meson
|
||||
tests: unit
|
||||
omemo: signal
|
||||
script: ./scripts/build-configuration-matrix.sh meson
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
omemo_env: libsignal
|
||||
- flavor: ubuntu
|
||||
buildsystem: meson
|
||||
tests: unit
|
||||
omemo: signal
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
omemo_env: libsignal
|
||||
- flavor: debian
|
||||
buildsystem: meson
|
||||
tests: unit
|
||||
omemo: libomemo
|
||||
script: ./scripts/build-configuration-matrix.sh meson
|
||||
script: ./scripts/build-configuration-matrix.sh
|
||||
omemo_env: libomemo-c
|
||||
|
||||
name: ${{ matrix.flavor }} | ${{ matrix.buildsystem }} | ${{ matrix.tests }} | ${{ matrix.omemo }}
|
||||
|
||||
Reference in New Issue
Block a user