Skip to content

Commit b0b3de0

Browse files
authored
Merge branch 'main' into xcodebuild_setup
2 parents e540508 + 141867f commit b0b3de0

File tree

8 files changed

+58
-20
lines changed

8 files changed

+58
-20
lines changed

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

+19-3
Original file line numberDiff line numberDiff line change
@@ -11535,6 +11535,14 @@ const { isUint8Array, isArrayBuffer } = __nccwpck_require__(8253)
1153511535
const { File: UndiciFile } = __nccwpck_require__(3041)
1153611536
const { parseMIMEType, serializeAMimeType } = __nccwpck_require__(4322)
1153711537

11538+
let random
11539+
try {
11540+
const crypto = __nccwpck_require__(7598)
11541+
random = (max) => crypto.randomInt(0, max)
11542+
} catch {
11543+
random = (max) => Math.floor(Math.random(max))
11544+
}
11545+
1153811546
let ReadableStream = globalThis.ReadableStream
1153911547

1154011548
/** @type {globalThis['File']} */
@@ -11620,7 +11628,7 @@ function extractBody (object, keepalive = false) {
1162011628
// Set source to a copy of the bytes held by object.
1162111629
source = new Uint8Array(object.buffer.slice(object.byteOffset, object.byteOffset + object.byteLength))
1162211630
} else if (util.isFormDataLike(object)) {
11623-
const boundary = `----formdata-undici-0${`${Math.floor(Math.random() * 1e11)}`.padStart(11, '0')}`
11631+
const boundary = `----formdata-undici-0${`${random(1e11)}`.padStart(11, '0')}`
1162411632
const prefix = `--${boundary}\r\nContent-Disposition: form-data`
1162511633

1162611634
/*! formdata-polyfill. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */
@@ -25739,6 +25747,14 @@ module.exports = require("net");
2573925747

2574025748
/***/ }),
2574125749

25750+
/***/ 7598:
25751+
/***/ ((module) => {
25752+
25753+
"use strict";
25754+
module.exports = require("node:crypto");
25755+
25756+
/***/ }),
25757+
2574225758
/***/ 8474:
2574325759
/***/ ((module) => {
2574425760

@@ -27685,8 +27701,8 @@ const checkSubmodules = async function () {
2768527701
const isOnMain = await isAncestor(diff.thisCommit, 'origin/main', submodule.path);
2768627702
if (!isOnMain) {
2768727703
if (/^(aws-lc)$/.test(submodule.name)) {
27688-
// for aws-lc we also use fips-2022-11-02 branch for FIPS support.
27689-
const isOnFIPS = await isAncestor(diff.thisCommit, 'origin/fips-2022-11-02', submodule.path);
27704+
// for aws-lc, we may use a branch for FIPS support.
27705+
const isOnFIPS = await isAncestor(diff.thisCommit, 'origin/fips-2024-09-27', submodule.path);
2769027706
if (!isOnFIPS) {
2769127707
core.setFailed(`Submodule ${submodule.name} is using a branch`);
2769227708
return;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ const checkSubmodules = async function () {
144144
const isOnMain = await isAncestor(diff.thisCommit, 'origin/main', submodule.path);
145145
if (!isOnMain) {
146146
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);
147+
// for aws-lc, we may use a branch for FIPS support.
148+
const isOnFIPS = await isAncestor(diff.thisCommit, 'origin/fips-2024-09-27', submodule.path);
149149
if (!isOnFIPS) {
150150
core.setFailed(`Submodule ${submodule.name} is using a branch`);
151151
return;

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

+6-6
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

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

.github/actions/release-tag/packed/index.js

+17-1
Original file line numberDiff line numberDiff line change
@@ -11535,6 +11535,14 @@ const { isUint8Array, isArrayBuffer } = __nccwpck_require__(8253)
1153511535
const { File: UndiciFile } = __nccwpck_require__(3041)
1153611536
const { parseMIMEType, serializeAMimeType } = __nccwpck_require__(4322)
1153711537

11538+
let random
11539+
try {
11540+
const crypto = __nccwpck_require__(7598)
11541+
random = (max) => crypto.randomInt(0, max)
11542+
} catch {
11543+
random = (max) => Math.floor(Math.random(max))
11544+
}
11545+
1153811546
let ReadableStream = globalThis.ReadableStream
1153911547

1154011548
/** @type {globalThis['File']} */
@@ -11620,7 +11628,7 @@ function extractBody (object, keepalive = false) {
1162011628
// Set source to a copy of the bytes held by object.
1162111629
source = new Uint8Array(object.buffer.slice(object.byteOffset, object.byteOffset + object.byteLength))
1162211630
} else if (util.isFormDataLike(object)) {
11623-
const boundary = `----formdata-undici-0${`${Math.floor(Math.random() * 1e11)}`.padStart(11, '0')}`
11631+
const boundary = `----formdata-undici-0${`${random(1e11)}`.padStart(11, '0')}`
1162411632
const prefix = `--${boundary}\r\nContent-Disposition: form-data`
1162511633

1162611634
/*! formdata-polyfill. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */
@@ -25739,6 +25747,14 @@ module.exports = require("net");
2573925747

2574025748
/***/ }),
2574125749

25750+
/***/ 7598:
25751+
/***/ ((module) => {
25752+
25753+
"use strict";
25754+
module.exports = require("node:crypto");
25755+
25756+
/***/ }),
25757+
2574225758
/***/ 8474:
2574325759
/***/ ((module) => {
2574425760

.github/workflows/create-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
153153
upload-ci-script:
154154
name: Upload container ci script
155-
runs-on: ubuntu-2024
155+
runs-on: ubuntu-24.04
156156

157157
steps:
158158
- uses: aws-actions/configure-aws-credentials@v4

.github/workflows/sanity-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
- musllinux-1-1-x64
298298

299299
needs: package
300-
runs-on: ubuntu-24.04
300+
runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu as 24.04 likes to segfault in the middle of the build
301301
steps:
302302
- uses: aws-actions/configure-aws-credentials@v4
303303
with:

builder/core/data.py

+6
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,12 @@ class PKG_TOOLS(Enum):
572572
'yum_compiler_packages': ['gcc', 'gcc-c++'],
573573

574574
'versions': {
575+
'default': {
576+
'!c': "gcc",
577+
'!cxx': "g++",
578+
'!compiler_packages': [],
579+
'!apt_compiler_packages': [],
580+
},
575581
'4.8': {
576582
# ASan has been broken on 4.8 GCC version distributed on Ubuntu
577583
# and will unlikely to get fixed upstream. so turn it off.

0 commit comments

Comments
 (0)