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

support fips branch for aws-lc #278

Merged
merged 4 commits into from
Mar 12, 2024
Merged

support fips branch for aws-lc #278

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95cc84d
support fips branch
TingDaoK Mar 8, 2024
a3b0f57
Merge branch 'main' into support-fips-branch
TingDaoK Mar 12, 2024
7ee3dc3
optimize
TingDaoK Mar 12, 2024
77833a4
Merge branch 'support-fips-branch' of github.com:awslabs/aws-crt-buil…
TingDaoK Mar 12, 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
13 changes: 11 additions & 2 deletions .github/actions/check-submodules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,17 @@ const checkSubmodules = async function () {
if (nonCrtRepo.test(submodule.name)) {
const isOnMain = await isAncestor(diff.thisCommit, 'origin/main', submodule.path);
if (!isOnMain) {
core.setFailed(`Submodule ${submodule.name} is using a branch`);
return;
if (/^(aws-lc)$/.test(submodule.name)) {
// for aws-lc we also use fips-2022-11-02 branch for FIPS support.
const isOnFIPS = await isAncestor(diff.thisCommit, 'origin/fips-2022-11-02', submodule.path);
if (!isOnFIPS) {
core.setFailed(`Submodule ${submodule.name} is using a branch`);
return;
}
} else {
core.setFailed(`Submodule ${submodule.name} is using a branch`);
return;
}
}
} else {
core.setFailed(`Submodule ${submodule.name} is not using a tagged release`);
Expand Down
Loading