Browse Source

ftp ci improvements

Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman 3 years ago
parent
commit
a3f1d10f4d
2 changed files with 13 additions and 8 deletions
  1. 12 7
      .github/workflows/ftp.yml
  2. 1 1
      apps/files_external/lib/Lib/Storage/FTP.php

+ 12 - 7
.github/workflows/ftp.yml

@@ -29,13 +29,8 @@ jobs:
     steps:
       - name: Checkout server
         uses: actions/checkout@v2
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with:
+          submodules: true
 
       - name: Set up ftpd
         run: |
@@ -71,3 +66,13 @@ jobs:
         if: always()
         run: |
           docker logs ftp
+
+  ftp-summary:
+    runs-on: ubuntu-latest
+    needs: ftp-tests
+
+    if: always()
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.ftp-tests.result != 'success' }}; then exit 1; fi

+ 1 - 1
apps/files_external/lib/Lib/Storage/FTP.php

@@ -103,7 +103,7 @@ class FTP extends Common {
 
 	public static function checkDependencies() {
 		if (function_exists('ftp_login')) {
-			return (true);
+			return true;
 		} else {
 			return ['ftp'];
 		}