Skip to content

Commit a083a69

Browse files
authored
Merge branch 'main' into fix-coverage-report-hang
2 parents b356e7f + c97f971 commit a083a69

File tree

14 files changed

+710
-136
lines changed

14 files changed

+710
-136
lines changed

.github/actions/check-submodules/dist/index.js

+284-55
Large diffs are not rendered by default.

.github/actions/check-submodules/index.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,17 @@ const checkSubmodules = async function () {
143143
if (nonCrtRepo.test(submodule.name)) {
144144
const isOnMain = await isAncestor(diff.thisCommit, 'origin/main', submodule.path);
145145
if (!isOnMain) {
146-
core.setFailed(`Submodule ${submodule.name} is using a branch`);
147-
return;
146+
if (/^(aws-lc)$/.test(submodule.name)) {
147+
// for aws-lc we also use fips-2022-11-02 branch for FIPS support.
148+
const isOnFIPS = await isAncestor(diff.thisCommit, 'origin/fips-2022-11-02', submodule.path);
149+
if (!isOnFIPS) {
150+
core.setFailed(`Submodule ${submodule.name} is using a branch`);
151+
return;
152+
}
153+
} else {
154+
core.setFailed(`Submodule ${submodule.name} is using a branch`);
155+
return;
156+
}
148157
}
149158
} else {
150159
core.setFailed(`Submodule ${submodule.name} is not using a tagged release`);

.github/actions/check-submodules/package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/release-tag/package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)