]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
CI/macos: convert CRLF to LF and align indentation
authorMarc Hoersken <info@marc-hoersken.de>
Thu, 9 Apr 2020 22:59:35 +0000 (00:59 +0200)
committerMarc Hoersken <info@marc-hoersken.de>
Thu, 9 Apr 2020 22:59:35 +0000 (00:59 +0200)
.github/workflows/macos.yml

index 6c76ca78a80a51c455945e0280dbe78be7e4294a..6910b9ce4080c599329931fabe327a09c0cb42c0 100644 (file)
@@ -1,97 +1,97 @@
-name: CI\r
-\r
-on:\r
-  # Trigger the workflow on push or pull requests, but only for the\r
-  # master branch\r
-  push:\r
-    branches:\r
-      - master\r
-      - '*/ci'\r
-  pull_request:\r
-    branches:\r
-      - master\r
-\r
-jobs:\r
-  autotools:\r
-    name: macos ${{ matrix.build.name }}\r
-    runs-on: 'macos-latest'\r
-    strategy:\r
-      fail-fast: false\r
-      matrix:\r
-        build:\r
-        - name: normal\r
-          install: nghttp2\r
-        - name: debug\r
-          install: nghttp2\r
-          configure: --enable-debug --enable-werror --without-brotli\r
-        - name: libssh2\r
-          install: nghttp2 libssh2\r
-          configure: --enable-debug --with-libssh2\r
-        - name: c-ares\r
-          install: nghttp2\r
-          configure: --enable-debug --enable-ares\r
-        - name: HTTP only\r
-          install: nghttp2\r
-          configure: --enable-debug --enable-werror --enable-maintainer-mode --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib\r
-        - name: SecureTransport metalink\r
-          install: nghttp2 openssl libmetalink\r
-          configure: --enable-debug --without-ssl --with-darwinssl --with-libmetalink\r
-        - name: OpenSSL metalink\r
-          install: nghttp2 openssl libmetalink\r
-          configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink\r
-        - name: LibreSSL metalink\r
-          install: nghttp2 libressl libmetalink\r
-          configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink\r
-        - name: torture\r
-          install: nghttp2 openssl\r
-          configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc\r
-          tflags: -n -t --shallow=25 !FTP\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-\r
-    - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}\r
-      name: 'brew install'\r
-\r
-    - run: ./buildconf && ./configure ${{ matrix.build.configure }}\r
-      name: 'configure'\r
-\r
-    - run: make\r
-      name: 'make'\r
-\r
-    - run: make test-nonflaky\r
-      name: 'test'\r
-      env:\r
-        TFLAGS: "${{ matrix.build.tflags }} ~1452"\r
-\r
-  cmake:\r
-    name: macos cmake ${{ matrix.compiler.CC }} ${{ matrix.build.name }}\r
-    runs-on: 'macos-latest'\r
-    env: ${{ matrix.compiler }}\r
-    strategy:\r
-      fail-fast: false\r
-      matrix:\r
-        compiler:\r
-        - CC: clang\r
-          CXX: clang++\r
-        - CC: gcc-8\r
-          CXX: g++-8\r
-        - CC: gcc-9\r
-          CXX: g++-9\r
-        build:\r
-        - name: OpenSSL\r
-          install: nghttp2 openssl\r
-          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON\r
-        - name: LibreSSL\r
-          install: nghttp2 libressl\r
-          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-\r
-    - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}\r
-      name: 'brew install'\r
-\r
-    - run: cmake -H. -Bbuild ${{ matrix.build.generate }}\r
-      name: 'cmake generate'\r
-\r
-    - run: cmake --build build\r
-      name: 'cmake build'\r
+name: CI
+
+on:
+  # Trigger the workflow on push or pull requests, but only for the
+  # master branch
+  push:
+    branches:
+    - master
+    - '*/ci'
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  autotools:
+    name: macos ${{ matrix.build.name }}
+    runs-on: 'macos-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+        - name: normal
+          install: nghttp2
+        - name: debug
+          install: nghttp2
+          configure: --enable-debug --enable-werror --without-brotli
+        - name: libssh2
+          install: nghttp2 libssh2
+          configure: --enable-debug --with-libssh2
+        - name: c-ares
+          install: nghttp2
+          configure: --enable-debug --enable-ares
+        - name: HTTP only
+          install: nghttp2
+          configure: --enable-debug --enable-werror --enable-maintainer-mode --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib
+        - name: SecureTransport metalink
+          install: nghttp2 openssl libmetalink
+          configure: --enable-debug --without-ssl --with-darwinssl --with-libmetalink
+        - name: OpenSSL metalink
+          install: nghttp2 openssl libmetalink
+          configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink
+        - name: LibreSSL metalink
+          install: nghttp2 libressl libmetalink
+          configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink
+        - name: torture
+          install: nghttp2 openssl
+          configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc
+          tflags: -n -t --shallow=25 !FTP
+    steps:
+    - uses: actions/checkout@v2
+
+    - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}
+      name: 'brew install'
+
+    - run: ./buildconf && ./configure ${{ matrix.build.configure }}
+      name: 'configure'
+
+    - run: make
+      name: 'make'
+
+    - run: make test-nonflaky
+      name: 'test'
+      env:
+        TFLAGS: "${{ matrix.build.tflags }} ~1452"
+
+  cmake:
+    name: macos cmake ${{ matrix.compiler.CC }} ${{ matrix.build.name }}
+    runs-on: 'macos-latest'
+    env: ${{ matrix.compiler }}
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+        - CC: clang
+          CXX: clang++
+        - CC: gcc-8
+          CXX: g++-8
+        - CC: gcc-9
+          CXX: g++-9
+        build:
+        - name: OpenSSL
+          install: nghttp2 openssl
+          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+        - name: LibreSSL
+          install: nghttp2 libressl
+          generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+    steps:
+    - uses: actions/checkout@v2
+
+    - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}
+      name: 'brew install'
+
+    - run: cmake -H. -Bbuild ${{ matrix.build.generate }}
+      name: 'cmake generate'
+
+    - run: cmake --build build
+      name: 'cmake build'