Skip to content

Commit 6a99321

Browse files
committed
ci: reuse GitHub workflow
1 parent c6fc430 commit 6a99321

4 files changed

Lines changed: 39 additions & 71 deletions

File tree

.github/workflows/fork.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ on:
88
tags:
99
- '**'
1010
workflow_dispatch:
11+
pull_request:
12+
types: [opened, synchronize, reopened]
1113

1214
jobs:
1315
# Run tests in release mode for tags and scheduled runs
1416
main:
15-
if: github.repository == 'Cosmian/kms'
1617
secrets: inherit
1718
uses: ./.github/workflows/main_base.yml
1819
with:

.github/workflows/main_base.yml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,41 @@ jobs:
3434
with:
3535
toolchain: ${{ inputs.toolchain }}
3636

37-
# ml-kem-0.2.1 does not build on toolchain 1.90.0 and cargo-semver v0.44.0.
38-
# cargo-semver:
39-
# uses: Cosmian/reusable_workflows/.github/workflows/cargo-semver.yml@develop
40-
# with:
41-
# toolchain: ${{ inputs.toolchain }}
37+
cargo-test:
38+
name: No Nix - ${{ matrix.runner }} - ${{ matrix.type }} - ${{ matrix.features }}
39+
runs-on: ${{ matrix.runner }}
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
type:
44+
- sqlite
45+
features: [fips, non-fips]
46+
runner: [ubuntu-24.04, ubuntu-24.04-arm, macos-15]
47+
48+
steps:
49+
- uses: dtolnay/rust-toolchain@master
50+
with:
51+
toolchain: 1.90.0
52+
components: rustfmt, clippy
53+
54+
- uses: actions/checkout@v6
55+
with:
56+
submodules: recursive
57+
58+
- name: With bash test script
59+
run: |
60+
set -ex
61+
bash .github/scripts/test_${{ matrix.type }}.sh --profile debug --variant ${{ matrix.features }}
62+
63+
- name: With cargo only
64+
run: |
65+
set -ex
66+
if [ "${{ matrix.features }}" = "non-fips" ]; then
67+
export FEATURES_FLAG="--features non-fips";
68+
else
69+
export FEATURES_FLAG="";
70+
fi
71+
cargo test --workspace --lib $FEATURES_FLAG -- --nocapture
4272
4373
cargo-publish:
4474
name: Cargo Publish Workspace
@@ -49,6 +79,7 @@ jobs:
4979
token: ${{ secrets.CRATES_IO }}
5080

5181
test: # Run all tests
82+
if: github.repository == 'Cosmian/kms'
5283
uses: ./.github/workflows/test_all.yml
5384
secrets: inherit
5485
with:

deny.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,14 @@ allow = [
9797
"OpenSSL",
9898
"ISC",
9999
"Zlib",
100-
"MPL-2.0",
101100
"BSD-2-Clause",
102101
"BSD-3-Clause",
103102
"Unicode-3.0",
104103
"CC0-1.0",
105104
"BUSL-1.1",
106-
"AGPL-3.0",
107-
"GPL-3.0",
105+
"AGPL-3.0-or-later",
108106
"CDLA-Permissive-2.0",
109107
"GPL-3.0-or-later", # alcoholic_jwt-4091.0.0
110-
"AGPL-3.0-only", # synthesized
111108
]
112109
# The confidence threshold for detecting a license from license text.
113110
# The higher the value, the more closely the license text must be to the

0 commit comments

Comments
 (0)