X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcodeql-analysis.yml;h=194a08da4a4151bb6a8d5db35bd735260eeb4757;hb=0021eb1fac2d7a6e628b1a4125cecd7520f7b6b6;hp=76b61afafab82b9b8880faebba1c9aeeff3afbbb;hpb=96ae017c074fbdb6734b034210e2ce6c0be846ab;p=openssl-gost%2Fengine.git

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 76b61af..194a08d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,7 +1,7 @@
 name: "CodeQL"
 
 env:
-  OPENSSL_BRANCH: openssl-3.0.0-alpha13
+  OPENSSL_BRANCH: openssl-3.0
   #RPATH: "-Wl,-rpath=${PREFIX}/lib"
   #PREFIX: ${HOME}/opt
   #PATH: ${PREFIX}/bin:${PATH}
@@ -27,6 +27,8 @@ jobs:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
+        # gost-engine has submodules
+        submodules: true
 
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.
@@ -61,7 +63,7 @@ jobs:
        export RPATH="-Wl,-rpath=${PREFIX}/lib"
        cd openssl
        git describe --always --long
-       ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} ${RPATH}
+       ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} --libdir=lib ${RPATH}
        make -s build_libs
        make -s build_programs
        make -s install_sw
@@ -69,7 +71,7 @@ jobs:
        set -e
        mkdir build
        cd build
-       cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
+       cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
        make
 
     - name: Perform CodeQL Analysis