diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 022207b8..ac7e9c98 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -19,13 +19,13 @@ jobs: upload_for_test: "false" - environment: "ubuntu:24.04" cc: "clang" - upload_for_test: "false" + upload_for_test: "true" - environment: "ubuntu:22.04" cc: "gcc" upload_for_test: "false" - environment: "ubuntu:22.04" cc: "clang" - upload_for_test: "true" + upload_for_test: "false" - environment: "ubuntu:20.04" cc: "gcc" upload_for_test: "false" @@ -351,7 +351,7 @@ jobs: fail-fast: false matrix: include: - - environment: "ubuntu:22.04" + - environment: "ubuntu:24.04" cc: "clang" - environment: "fedora:40" cc: "gcc" @@ -366,7 +366,7 @@ jobs: - name: install dependencies from package management (debian based) env: DEBIAN_FRONTEND: noninteractive - if: ${{ matrix.environment == 'ubuntu:22.04' }} + if: ${{ matrix.environment == 'ubuntu:24.04' }} run: | apt update apt install -q -y build-essential cmake python3 python3-pip python3-setuptools curl libedit2 libpcsclite1 libengine-pkcs11-openssl opensc swig openjdk-11-jdk-headless libssl3 diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index ec794587..8745fdaf 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -1,9 +1,9 @@ name: Run Integration Tests -on: - schedule: - # Run this every wednesday at 3:40. https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule - - cron: '40 3 * * 3' +on: [push, pull_request] +# schedule: +# # Run this every wednesday at 3:40. https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule +# - cron: '40 3 * * 3' jobs: main: diff --git a/resources/tests/bash/opensc_test.sh b/resources/tests/bash/opensc_test.sh index f1f3aa7c..592c90c7 100755 --- a/resources/tests/bash/opensc_test.sh +++ b/resources/tests/bash/opensc_test.sh @@ -13,14 +13,14 @@ MODULE=$1 set -e echo "******************* Generation Tests ********************* " -pkcs11-tool --module $MODULE --login --pin 0001password --keypairgen --id 100 --key-type EC:secp384r1 +pkcs11-tool --module $MODULE --login --pin 0001password --keypairgen --id 1 --key-type EC:secp384r1 pkcs11-tool --module $MODULE --login --pin 0001password --keypairgen --id 2 --key-type EC:prime256v1 pkcs11-tool --module $MODULE --login --pin 0001password --keypairgen --id 4 --key-type rsa:2048 --usage-sign pkcs11-tool --module $MODULE --login --pin 0001password --keypairgen --id 5 --key-type rsa:3072 --usage-sign echo "******************* Signing Tests ********************* " echo "this is test data" > data.txt -pkcs11-tool --module $MODULE --sign --pin 0001password --id 100 -m ECDSA-SHA1 --signature-format openssl -i data.txt -o data.sig +pkcs11-tool --module $MODULE --sign --pin 0001password --id 1 -m ECDSA-SHA1 --signature-format openssl -i data.txt -o data.sig pkcs11-tool --module $MODULE --sign --pin 0001password --id 2 -m ECDSA-SHA1 --signature-format openssl -i data.txt -o data.sig pkcs11-tool --module $MODULE --sign --pin 0001password --id 4 -m SHA512-RSA-PKCS -i data.txt -o data.sig pkcs11-tool --module $MODULE --sign --pin 0001password --id 5 -m SHA512-RSA-PKCS -i data.txt -o data.sig