Now that there is an actual openssl-3.0 branch, switch to use that

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64e0458715038669bbfe3f5dec93984fa5be45be..14718dcac98881b6b53230e5df32944c3f42d40d 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,8 @@ 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:
@@ -23,6 +24,8 @@ jobs:
 
     macos-openssl-stable:
         runs-on: macos-11
+        env:
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
@@ -41,6 +44,7 @@ jobs:
         runs-on: macos-11
         env:
             OPENSSL_BRANCH: master
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
@@ -61,27 +65,10 @@ 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
-              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
+            - uses: actions/checkout@v2
+            - run: .github/before_script.sh
             - run: .github/script.sh
 
     gcc-openssl-stable-x86: