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.

Sign up for GitHub

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

CI: Simplify kryoptic build #473

Merged
merged 2 commits into from
Dec 19, 2024
Merged

CI: Simplify kryoptic build #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4cb06a
CI: Simplify kryoptic build
Jakuje Nov 22, 2024
6f02859
Suppress errors on the OpenSSL error stack
simo5 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,9 @@ jobs:

- name: Install Dependencies
run: |
dnf -y install clang git meson cargo expect \
pkgconf-pkg-config openssl-devel openssl opensc \
p11-kit-devel p11-kit-server gnutls-utils \
gcc g++ perl-interpreter zlib-devel sqlite-devel \
httpd bind9-next softhsm \
'perl(Module::Load::Conditional)' 'perl(File::Temp)' \
'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
'perl(File::Compare)' 'perl(File::Copy)'
dnf -y install clang git meson cargo expect pkgconf-pkg-config \
openssl-devel openssl opensc p11-kit-devel gnutls-utils \
gcc g++ sqlite-devel httpd bind9-next softhsm

- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -85,17 +80,8 @@ jobs:
run: |
git clone https://github.com/latchset/kryoptic.git
cd kryoptic
git submodule update --init
echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"

- name: OpenSSL build cache
uses: actions/cache@v4
id: cache
with:
path: |
kryoptic/openssl/
key: ${{ runner.os }}-ossl-${{ hashFiles('kryoptic/.git/modules/openssl/HEAD') }}

- name: Generate lock file
run: |
cd kryoptic
Expand All @@ -115,7 +101,7 @@ jobs:
- name: Build Kryoptic
run: |
cd kryoptic
cargo build --features standard
cargo build --features dynamic,standard

- name: Setup, Build and Install pkcs11-provider
run: |
Expand Down
24 changes: 5 additions & 19 deletions .github/workflows/kryoptic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,9 @@ jobs:

- name: Install Dependencies
run: |
dnf -y install clang git meson cargo expect \
pkgconf-pkg-config openssl-devel openssl opensc \
p11-kit-devel p11-kit-server gnutls-utils \
gcc g++ perl-interpreter zlib-devel sqlite-devel \
'perl(Module::Load::Conditional)' 'perl(File::Temp)' \
'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
'perl(File::Compare)' 'perl(File::Copy)' \
python3-six which
dnf -y install clang git meson cargo expect pkgconf-pkg-config \
openssl-devel openssl opensc p11-kit-devel gnutls-utils \
gcc g++ sqlite-devel python3-six which

- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -45,17 +40,8 @@ jobs:
run: |
git clone https://github.com/latchset/kryoptic.git
cd kryoptic
git submodule update --init
echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"

- name: OpenSSL build cache
uses: actions/cache@v4
id: cache
with:
path: |
kryoptic/openssl/
key: ${{ runner.os }}-ossl-${{ hashFiles('kryoptic/.git/modules/openssl/HEAD') }}

- name: Generate lock file
run: |
cd kryoptic
Expand All @@ -75,8 +61,8 @@ jobs:
- name: Build Kryoptic
run: |
cd kryoptic
cargo build --features standard,nssdb
cargo test --features standard,nssdb | tee testout.log 2>&1
cargo build --features dynamic,standard,nssdb
cargo test --features dynamic,standard,nssdb | tee testout.log 2>&1
grep -q "0 failed" testout.log

- name: Setup
Expand Down
Loading
Loading