diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2024-02-21 03:36:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 03:36:27 +0000 |
| commit | 57b9b27177b8f31dbe44a66b62f92201296b5337 (patch) | |
| tree | 1b01132e15db02538dcf10922559df5a286d1cd6 /.github/workflows/configure-vs-cmake.yml | |
| parent | 674dacb61ed7ec74e882b6413316e027b279a2c7 (diff) | |
| parent | 5a7a71055c2c5ea8e7342422964c47f1e2d03970 (diff) | |
| download | curl-57b9b27177b8f31dbe44a66b62f92201296b5337.tar.gz | |
Merge "Upgrade curl to curl-8_6_0" into main am: 5a7a71055c
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/2970072
Change-Id: I156c2098c246d275dc0d2a91fbbfcfba6e293306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to '.github/workflows/configure-vs-cmake.yml')
| -rw-r--r-- | .github/workflows/configure-vs-cmake.yml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/.github/workflows/configure-vs-cmake.yml b/.github/workflows/configure-vs-cmake.yml index 3131bc128..dc2273f73 100644 --- a/.github/workflows/configure-vs-cmake.yml +++ b/.github/workflows/configure-vs-cmake.yml @@ -6,23 +6,23 @@ name: configure-vs-cmake on: push: branches: - - master + - master paths: - - '*.ac' - - '**/*.m4' - - '**/CMakeLists.txt' - - 'lib/curl_config.h.cmake' - - 'scripts/cmp-config.pl' + - '*.ac' + - '**/*.m4' + - '**/CMakeLists.txt' + - 'lib/curl_config.h.cmake' + - 'scripts/cmp-config.pl' pull_request: branches: - - master + - master paths: - - '*.ac' - - '**/*.m4' - - '**/CMakeLists.txt' - - 'lib/curl_config.h.cmake' - - 'scripts/cmp-config.pl' + - '*.ac' + - '**/*.m4' + - '**/CMakeLists.txt' + - 'lib/curl_config.h.cmake' + - 'scripts/cmp-config.pl' permissions: {} @@ -30,16 +30,16 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: run configure --with-openssl - run: | - autoreconf -fi - ./configure --with-openssl + - name: run configure --with-openssl + run: | + autoreconf -fi + ./configure --with-openssl --without-libpsl - - name: run cmake - run: | - mkdir build && cd build && cmake .. + - name: run cmake + run: | + mkdir build && cd build && cmake .. - - name: compare generated curl_config.h files - run: ./scripts/cmp-config.pl lib/curl_config.h build/lib/curl_config.h + - name: compare generated curl_config.h files + run: ./scripts/cmp-config.pl lib/curl_config.h build/lib/curl_config.h |