Skip to content

Commit

Permalink
Merge pull request #8882 from bdunne/frozen_lockfile
Browse files Browse the repository at this point in the history 
Lock down es-abstract to avoid build issues on s390x
  • Loading branch information
@Fryguy
Fryguy authored Aug 1, 2023
2 parents 212f097 + eac88be commit 9bb4e74
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 22 deletions.
7 changes: 6 additions & 1 deletion lib/tasks/manageiq/ui_tasks.rake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ namespace :update do
next
end
puts "== #{engine.name} =="
require 'json'
package_json = JSON.load_file("./package.json")
package_json["resolutions"] ||= {}
package_json["resolutions"]["es-abstract"] = "~1.21.3"
File.write("./package.json", JSON.pretty_generate(package_json))
system("which yarn >/dev/null") || abort("\n== You have to install yarn ==")
system("yarn set version 1.22.18") || abort("\n== yarn failed to set version to 1.22.18 in #{engine.path} ==") if RUBY_PLATFORM.include?("s390x")
system("yarn --frozen-lockfile") || abort("\n== yarn failed in #{engine.path} ==") # Switch --frozen-lockfile to --immutable once s390x is off of yarn 1.
system("yarn") || abort("\n== yarn failed in #{engine.path} ==") # Add --immutable once s390x is off of yarn 1.
end
end
end
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
"packageManager": "yarn@3.5.0",
"resolutions": {
"decode-uri-component": "^0.2.2",
"es-abstract": "~1.21.3",
"express": "^4.18.2",
"minimatch": "~3.1.2",
"moment-timezone": "~0.5.40",
Expand Down
100 changes: 79 additions & 21 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3526,6 +3526,16 @@ __metadata:
languageName: node
linkType: hard

"array-buffer-byte-length@npm:^1.0.0":
version: 1.0.0
resolution: "array-buffer-byte-length@npm:1.0.0"
dependencies:
call-bind: ^1.0.2
is-array-buffer: ^3.0.1
checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
languageName: node
linkType: hard

"array-equal@npm:^1.0.0":
version: 1.0.0
resolution: "array-equal@npm:1.0.0"
Expand Down Expand Up @@ -6378,7 +6388,7 @@ __metadata:
languageName: node
linkType: hard

"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.1.4":
"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
version: 1.2.0
resolution: "define-properties@npm:1.2.0"
dependencies:
Expand Down Expand Up @@ -6972,44 +6982,46 @@ __metadata:
languageName: node
linkType: hard

"es-abstract@npm:^1.17.0-next.1, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.7.0":
version: 1.21.1
resolution: "es-abstract@npm:1.21.1"
"es-abstract@npm:~1.21.3":
version: 1.21.3
resolution: "es-abstract@npm:1.21.3"
dependencies:
array-buffer-byte-length: ^1.0.0
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
es-set-tostringtag: ^2.0.1
es-to-primitive: ^1.2.1
function-bind: ^1.1.1
function.prototype.name: ^1.1.5
get-intrinsic: ^1.1.3
get-intrinsic: ^1.2.1
get-symbol-description: ^1.0.0
globalthis: ^1.0.3
gopd: ^1.0.1
has: ^1.0.3
has-property-descriptors: ^1.0.0
has-proto: ^1.0.1
has-symbols: ^1.0.3
internal-slot: ^1.0.4
is-array-buffer: ^3.0.1
internal-slot: ^1.0.5
is-array-buffer: ^3.0.2
is-callable: ^1.2.7
is-negative-zero: ^2.0.2
is-regex: ^1.1.4
is-shared-array-buffer: ^1.0.2
is-string: ^1.0.7
is-typed-array: ^1.1.10
is-weakref: ^1.0.2
object-inspect: ^1.12.2
object-inspect: ^1.12.3
object-keys: ^1.1.1
object.assign: ^4.1.4
regexp.prototype.flags: ^1.4.3
regexp.prototype.flags: ^1.5.0
safe-regex-test: ^1.0.0
string.prototype.trim: ^1.2.7
string.prototype.trimend: ^1.0.6
string.prototype.trimstart: ^1.0.6
typed-array-byte-offset: ^1.0.0
typed-array-length: ^1.0.4
unbox-primitive: ^1.0.2
which-typed-array: ^1.1.9
checksum: 23ff60d42d17a55d150e7bcedbdb065d4077a8b98c436e0e2e1ef4dd532a6d78a56028673de0bd8ed464a43c46ba781c50d9af429b6a17e44dbd14c7d7fb7926
which-typed-array: ^1.1.10
checksum: 4c5ee900699030a629fc224a3595dcd05f9ff31d607e72bc9042d15e3b1bfde99f408c940b622e96439e755a7b23a3b9e47f3be234015750d32dad38b8f772f4
languageName: node
linkType: hard

Expand Down Expand Up @@ -8300,7 +8312,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"functions-have-names@npm:^1.2.2":
"functions-have-names@npm:^1.2.2, functions-have-names@npm:^1.2.3":
version: 1.2.3
resolution: "functions-have-names@npm:1.2.3"
checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
Expand Down Expand Up @@ -8348,6 +8360,18 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"get-intrinsic@npm:^1.2.1":
version: 1.2.1
resolution: "get-intrinsic@npm:1.2.1"
dependencies:
function-bind: ^1.1.1
has: ^1.0.3
has-proto: ^1.0.1
has-symbols: ^1.0.3
checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
languageName: node
linkType: hard

"get-package-type@npm:^0.1.0":
version: 0.1.0
resolution: "get-package-type@npm:0.1.0"
Expand Down Expand Up @@ -9297,7 +9321,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4":
"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5":
version: 1.0.5
resolution: "internal-slot@npm:1.0.5"
dependencies:
Expand Down Expand Up @@ -9388,6 +9412,17 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"is-array-buffer@npm:^3.0.2":
version: 3.0.2
resolution: "is-array-buffer@npm:3.0.2"
dependencies:
call-bind: ^1.0.2
get-intrinsic: ^1.2.0
is-typed-array: ^1.1.10
checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
languageName: node
linkType: hard

"is-arrayish@npm:^0.2.1":
version: 0.2.1
resolution: "is-arrayish@npm:0.2.1"
Expand Down Expand Up @@ -12377,7 +12412,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"object-inspect@npm:^1.12.2, object-inspect@npm:^1.7.0, object-inspect@npm:^1.9.0":
"object-inspect@npm:^1.12.3, object-inspect@npm:^1.7.0, object-inspect@npm:^1.9.0":
version: 1.12.3
resolution: "object-inspect@npm:1.12.3"
checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
Expand Down Expand Up @@ -14693,6 +14728,17 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"regexp.prototype.flags@npm:^1.5.0":
version: 1.5.0
resolution: "regexp.prototype.flags@npm:1.5.0"
dependencies:
call-bind: ^1.0.2
define-properties: ^1.2.0
functions-have-names: ^1.2.3
checksum: c541687cdbdfff1b9a07f6e44879f82c66bbf07665f9a7544c5fd16acdb3ec8d1436caab01662d2fbcad403f3499d49ab0b77fbc7ef29ef961d98cc4bc9755b4
languageName: node
linkType: hard

"regexpp@npm:^3.1.0":
version: 3.2.0
resolution: "regexpp@npm:3.2.0"
Expand Down Expand Up @@ -16099,7 +16145,7 @@ resolve@1.1.7:
languageName: node
linkType: hard

"string.prototype.trim@npm:^1.2.1":
"string.prototype.trim@npm:^1.2.1, string.prototype.trim@npm:^1.2.7":
version: 1.2.7
resolution: "string.prototype.trim@npm:1.2.7"
dependencies:
Expand Down Expand Up @@ -16915,6 +16961,19 @@ resolve@1.1.7:
languageName: node
linkType: hard

"typed-array-byte-offset@npm:^1.0.0":
version: 1.0.0
resolution: "typed-array-byte-offset@npm:1.0.0"
dependencies:
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
for-each: ^0.3.3
has-proto: ^1.0.1
is-typed-array: ^1.1.10
checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
languageName: node
linkType: hard

"typed-array-length@npm:^1.0.4":
version: 1.0.4
resolution: "typed-array-length@npm:1.0.4"
Expand Down Expand Up @@ -17615,17 +17674,16 @@ resolve@1.1.7:
languageName: node
linkType: hard

"which-typed-array@npm:^1.1.9":
version: 1.1.9
resolution: "which-typed-array@npm:1.1.9"
"which-typed-array@npm:^1.1.10":
version: 1.1.11
resolution: "which-typed-array@npm:1.1.11"
dependencies:
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
for-each: ^0.3.3
gopd: ^1.0.1
has-tostringtag: ^1.0.0
is-typed-array: ^1.1.10
checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef
checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
languageName: node
linkType: hard

Expand Down

0 comments on commit 9bb4e74

Please sign in to comment.