CI: set OpenSSL branch v.1.1.1g, apply new patch

[openssl-gost/engine.git] / .github / workflows / ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29740624339ee124dcf48d71a3fe462b5404cfc5..e039bacb48a5bf1c86c761292353b9b03e677209 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,17 +2,17 @@ name: CI
 on: [push, pull_request]
 
 env:
-    OPENSSL_BRANCH: openssl-3.0.0-alpha17
+    OPENSSL_BRANCH: OpenSSL_1_1_1g
 
 jobs:
-    gcc-openssl-stable:
+    gcc-openssl-111g:
         runs-on: ubuntu-20.04
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
             - run: .github/script.sh
 
-    clang-openssl-stable:
+    clang-openssl-111g:
         runs-on: ubuntu-20.04
         env:
             CC: clang
@@ -21,54 +21,17 @@ jobs:
             - run: .github/before_script.sh
             - run: .github/script.sh
 
-    gcc-openssl-master:
+    gcc-asan-openssl-111g:
         runs-on: ubuntu-20.04
         env:
-            OPENSSL_BRANCH: master
-        steps:
-            - uses: actions/checkout@v2
-            - run: .github/before_script.sh
-            - run: .github/script.sh
-
-    gcc-asan-openssl-master:
-        runs-on: ubuntu-20.04
-        env:
-            OPENSSL_BRANCH: master
+            OPENSSL_BRANCH: OpenSSL_1_1_1g
             ASAN: -DASAN=1
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
             - run: .github/script.sh
 
-    macos-asan-openssl-master:
-        runs-on: macos-latest
-        env:
-            OPENSSL_BRANCH: master
-            ASAN: -DASAN=1
-        steps:
-            - name: install cpanm and Test2::V0
-              uses: perl-actions/install-with-cpanm@v1
-              with:
-                  install: Test2::V0
-            - name: Checkout gost-engine
-              uses: actions/checkout@v2
-            - name: checkout OpenSSL
-              uses: actions/checkout@v2
-              with:
-                  repository: openssl/openssl
-                  ref: master
-                  path: openssl
-            - name: configure OpenSSL
-              run: |
-                  mkdir $HOME/opt
-                  ./Configure --prefix=$HOME/opt
-              working-directory: openssl
-            - name: build+install OpenSSL
-              run: make -s install_sw
-              working-directory: openssl
-            - run: .github/script.sh
-
-    gcc-openssl-stable-x86:
+    gcc-openssl-111g-x86:
         runs-on: ubuntu-20.04
         env:
             CFLAGS: -m32