Skip to content

Commit 5626c26

Browse files
authored
Merge branch 'main' into dependabot/github_actions/aws-actions/stale-issue-cleanup-6
2 parents 0c95ad6 + c97f971 commit 5626c26

File tree

18 files changed

+49304
-1270
lines changed

18 files changed

+49304
-1270
lines changed

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

+24,565-611
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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13-
"@actions/core": "^1.10.0",
13+
"@actions/core": "^1.10.1",
1414
"@actions/exec": "^1.1.1"
1515
},
1616
"devDependencies": {
17-
"@vercel/ncc": "^0.36.1"
17+
"@vercel/ncc": "^0.38.1"
1818
}
1919
}

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"prepare": "ncc build index.js --out packed"
1111
},
1212
"dependencies": {
13-
"@actions/core": "^1.10.0"
13+
"@actions/core": "^1.10.1"
1414
},
1515
"devDependencies": {
16-
"@vercel/ncc": "^0.36.1"
16+
"@vercel/ncc": "^0.38.1"
1717
}
1818
}

0 commit comments

Comments
 (0)