X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=8baf3ba1bcb48236783ac243962a65c18ab93ae9;hb=265d89dcbce7fce4fa2b560b70597132fd8eb3b2;hp=64e0458715038669bbfe3f5dec93984fa5be45be;hpb=128c0cba76ec599330aeb95df67069b544f22f41;p=openssl-gost%2Fengine.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64e0458..8baf3ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,13 +2,16 @@ name: CI
 on: [push, pull_request]
 
 env:
-    OPENSSL_BRANCH: openssl-3.0.0-beta2
+    OPENSSL_BRANCH: openssl-3.0
+    USE_RPATH: yes
 
 jobs:
     gcc-openssl-stable:
         runs-on: ubuntu-20.04
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
@@ -18,13 +21,19 @@ jobs:
             CC: clang
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
     macos-openssl-stable:
         runs-on: macos-11
+        env:
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
@@ -34,6 +43,8 @@ jobs:
             OPENSSL_BRANCH: master
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
@@ -41,8 +52,11 @@ jobs:
         runs-on: macos-11
         env:
             OPENSSL_BRANCH: master
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
@@ -53,6 +67,8 @@ jobs:
             ASAN: -DASAN=1
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh
 
@@ -61,27 +77,12 @@ jobs:
         env:
             OPENSSL_BRANCH: master
             ASAN: -DASAN=1
+            USE_RPATH:
         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
+            - 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
+                  submodules: true
+            - run: .github/before_script.sh
             - run: .github/script.sh
 
     gcc-openssl-stable-x86:
@@ -93,6 +94,8 @@ jobs:
             APT_INSTALL: gcc-multilib
         steps:
             - uses: actions/checkout@v2
+              with:
+                  submodules: true
             - run: .github/before_script.sh
             - run: .github/script.sh