config dir and always json

This commit is contained in:
Robin Appelman 2021-10-28 14:11:52 +02:00
commit 8176e2a7fe
2 changed files with 6 additions and 14 deletions

View file

@ -37,15 +37,11 @@ jobs:
run: | run: |
sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1 sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1
- name: Configure - name: Configure
if: matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12'
run: | run: |
cd samba-${{ matrix.pkgver }} cd samba-${{ matrix.pkgver }}
./buildtools/bin/waf configure --prefix=/ --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-ldap --without-libarchive --without-pam ./buildtools/bin/waf configure --prefix=/usr --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient \
- name: Configure --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-ldap --without-libarchive --without-pam \
if: matrix.pkgver != '4.8.12' && matrix.pkgver != '4.7.12' --with-configdir=/etc/samba --sysconfdir=/etc/samba --localstatedir=/var --enable-fhs
run: |
cd samba-${{ matrix.pkgver }}
./buildtools/bin/waf configure --prefix=/ --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-json --without-ldap --without-libarchive --without-pam
- name: Build - name: Build
run: | run: |
cd samba-${{ matrix.pkgver }} cd samba-${{ matrix.pkgver }}

View file

@ -39,15 +39,11 @@ jobs:
run: | run: |
sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1 sudo update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1
- name: Configure - name: Configure
if: matrix.pkgver == '4.8.12' || matrix.pkgver == '4.7.12'
run: | run: |
cd samba-${{ matrix.pkgver }} cd samba-${{ matrix.pkgver }}
./buildtools/bin/waf configure --prefix=/ --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-ldap --without-libarchive --without-pam ./buildtools/bin/waf configure --prefix=/usr --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient \
- name: Configure --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-ldap --without-libarchive --without-pam \
if: matrix.pkgver != '4.8.12' && matrix.pkgver != '4.7.12' --with-configdir=/etc/samba --sysconfdir=/etc/samba --localstatedir=/var --enable-fhs
run: |
cd samba-${{ matrix.pkgver }}
./buildtools/bin/waf configure --prefix=/ --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=client/smbclient --without-ad-dc --without-gettext --with-winbind --without-ads --disable-cups --without-json --without-ldap --without-libarchive --without-pam
- name: Build - name: Build
run: | run: |
cd samba-${{ matrix.pkgver }} cd samba-${{ matrix.pkgver }}