Skip to content

Commit

Permalink
Merge branch 'main' into fix-coverage-report-hang
Browse files Browse the repository at this point in the history
  • Loading branch information
TingDaoK authored Jun 5, 2024
2 parents b356e7f + c97f971 commit a083a69
Show file tree
Hide file tree
Showing 14 changed files with 710 additions and 136 deletions.
339 changes: 284 additions & 55 deletions .github/actions/check-submodules/dist/index.js

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions .github/actions/check-submodules/index.js
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
18 changes: 9 additions & 9 deletions .github/actions/check-submodules/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions .github/actions/release-tag/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a083a69

Please sign in to comment.