From: Wayne Davison <wayne@opencoder.net>
Date: Sat, 11 Jul 2020 23:05:34 +0000 (-0700)
Subject: More CI tweaks
X-Git-Tag: v3.2.3pre1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b25488fe9f5b2ddf952a3210b47c8b6bd930797;p=thirdparty%2Frsync.git

More CI tweaks

- Add to ubuntu build: make install & rsync-ssl test run
- Don't fail a build if samba.org daemon list has an issue.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index e57765cd..a8acc382 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ task:
     - ln -s /usr/local/bin/bash /bin/bash
   configure_script:
     - CPPFLAGS=-I/usr/local/include/ LDFLAGS=-L/usr/local/lib/ ./configure --disable-md2man
-  build_script:
+  make_script:
     - make
   install_script:
     - make install
@@ -15,5 +15,5 @@ task:
     - /usr/local/bin/rsync --version
   test_script:
     - make check
-  ssl_script:
-    - /usr/local/bin/rsync-ssl --no-motd download.samba.org::rsyncftp/
+  ssl_file_list_script:
+    - /usr/local/bin/rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 63116804..610a3dd4 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -14,18 +14,23 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: prepare-packages
-      run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm
+      run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev \
+            libxxhash-dev python3-cmarkgfm openssl
     - name: prepare-source
       run: ./prepare-source
     - name: configure
       run: ./configure --with-included-popt --with-included-zlib
     - name: make
       run: make
-    - name: version-summary
-      run: ./rsync --version
+    - name: install
+      run: sudo make install
+    - name: info
+      run: /usr/local/bin/rsync --version
     - name: make check
       run: make check
     - name: make check30
       run: make check30
     - name: make check29
       run: make check29
+    - name: ssl file list
+      run: /usr/local/bin/rsync-ssl --no-motd download.samba.org::rsyncftp/ || true