Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed pkcs11-register defaults on macOS and Windows #3053

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
CI: cache gengetopt in appveyor
  • Loading branch information
frankmorgner committed Mar 13, 2024
commit 82b2f474d9a6316027079ffb70f77211486d2287
24 changes: 15 additions & 9 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ environment:
PATH: C:\cygwin\bin;%PATH%
OPENPACE_VER: 1.1.3
ZLIB_VER_DOT: 1.2.12
GENGETOPT_VER: 2.23
matrix:
# not compatible with OpenSSL 1.1.1:
# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
Expand Down Expand Up @@ -62,14 +63,12 @@ install:
If (!(Test-Path cpdksetup.exe )) {
appveyor DownloadFile "https://download.microsoft.com/download/1/7/6/176909B0-50F2-4DF3-B29B-830A17EA7E38/CPDK_RELEASE_UPDATE/cpdksetup.exe"
}
- wget https://ftp.gnu.org/gnu/gengetopt/gengetopt-2.23.tar.xz
- tar xJf gengetopt-2.23.tar.xz
- cd gengetopt-2.23
- bash -c "exec 0</dev/null && ./configure --prefix=/ || cat config.log"
- bash -c "exec 0</dev/null && make"
- cd ..
#- curl -sSf -o C:\cygwin64\setup-x86_64.exe https://cygwin.com/setup-x86_64.exe
#- C:\cygwin64\setup-x86_64.exe -q -P gengetopt
- ps: >-
If (!(Test-Path C:\gengetopt )) {
appveyor DownloadFile "https://ftp.gnu.org/gnu/gengetopt/gengetopt-${env:GENGETOPT_VER}.tar.xz" -FileName gengetopt.tar.xz
7z x gengetopt.tar.xz -oC:\
Rename-Item -path "c:\gengetopt-${env:GENGETOPT_VER}" -newName "gengetopt"
}
- echo "Using %APPVEYOR_BUILD_WORKER_IMAGE% with %VCVARSALL%"
- call "%VCVARSALL%" %Platform%
- cpdksetup.exe /quiet
Expand Down Expand Up @@ -102,12 +101,18 @@ build_script:
}
$env:NMAKE_EXTRA+=" OPENPACE_DEF=/DENABLE_OPENPACE OPENPACE_DIR=C:\openpace-${env:OPENSSL_PF}"
}
If (!(Test-Path -Path "C:\gengetopt\gengetopt" )) {
cd C:\gengetopt
bash -c "exec 0</dev/null && ./configure --prefix=/ || cat config.log"
bash -c "exec 0</dev/null && make"
cd ${env:APPVEYOR_BUILD_FOLDER}
}
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap; fi"
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-pr$APPVEYOR_PULL_REQUEST_NUMBER\"; fi"
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH\"; fi"
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH-prAPPVEYOR_PULL_REQUEST_NUMBER\"; fi"
# disable features to speed up the script
- bash -c "exec 0</dev/null && ./configure --with-cygwin-native --disable-openssl --disable-readline --disable-zlib GENGETOPT=/cygdrive/c/projects/opensc/gengetopt-2.23/src/gengetopt --enable-cvcdir='%PROGRAMFILES%/OpenSC Project/OpenSC/cvc' --enable-x509dir='%PROGRAMFILES%/OpenSC Project/OpenSC/x509' || cat config.log"
- bash -c "exec 0</dev/null && ./configure --with-cygwin-native --disable-openssl --disable-readline --disable-zlib GENGETOPT=/cygdrive/c/gengetopt/src/gengetopt --enable-cvcdir='%PROGRAMFILES%/OpenSC Project/OpenSC/cvc' --enable-x509dir='%PROGRAMFILES%/OpenSC Project/OpenSC/x509' || cat config.log"
- bash -c "exec 0</dev/null && rm src/getopt.h"
- bash -c "exec 0</dev/null && make cmdline -C src/tools"
- nmake /f Makefile.mak %NMAKE_EXTRA%
Expand Down Expand Up @@ -139,4 +144,5 @@ cache:
- C:\openpace -> .appveyor.yml
- C:\openpace-Win32 -> .appveyor.yml
- C:\openpace-Win64 -> .appveyor.yml
- C:\gengetopt -> .appveyor.yml
- cpdksetup.exe -> .appveyor.yml