From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 19 Dec 2023 11:11:51 +0000 (+0100)
Subject: ci.yml: Fix bad conflict fix in backported patch
X-Git-Tag: openssl-3.0.13~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=293813d116ab7a6aa7cadc8daec13e8cb65fb702;p=thirdparty%2Fopenssl.git

ci.yml: Fix bad conflict fix in backported patch

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23090)

(cherry picked from commit b80cee9658ff18a6dbb575015589ebde1a94ffdc)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25757a98b98..6b7ffa292e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -373,27 +373,3 @@ jobs:
         default: true
     - name: test external pyca
       run: make test TESTS="test_external_pyca" VERBOSE=1
-==== BASE ====
-
-  external-test-cf-quiche:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Configure OpenSSL
-      run: ./config --banner=Configured --strict-warnings enable-external-tests && perl configdata.pm --dump
-    - name: make
-      run: make -s -j4
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: default
-        toolchain: stable
-        default: true
-    - name: get cpu info
-      run: |
-        cat /proc/cpuinfo
-        ./util/opensslwrap.sh version -c
-    - name: test external Cloudflare quiche
-      run: make test TESTS="test_external_cf_quiche" VERBOSE=1
-==== BASE ====