Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

More s390x lockdowns #1861

Merged
merged 1 commit into from
Sep 8, 2023
Merged

More s390x lockdowns #1861

merged 1 commit into from
Sep 8, 2023

Conversation

Fryguy
Copy link
Member

@Fryguy Fryguy commented Sep 8, 2023

This commit builds on top of #1860 to add more package lockdowns in order to prevent es-abstract 1.22 from being installed in the s390x environment since that env has problems with it when run under yarn 1

(Reminder that we need yarn 1 for the time-being because builds on yarn 3 hang on s390x, however yarn 1 ignores the lockfile and installs the latest version regardless, which sometimes brings in packages that are problematic; in this case es-abstract 1.22)

@jrafanie @bdunne Please review. This is the yarn1 diff with these changes which shows es-abtract 1.22 no longer in the lockfile

@ yarn.lock:2037 @ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==

-array-includes@^3.0.2, array-includes@^3.1.1, array-includes@~3.1.1:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
-  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+array-includes@3.1.6, array-includes@^3.0.2, array-includes@^3.1.1:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"

 array-union@^1.0.1:
@ yarn.lock:2070 @ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==

-array.prototype.flat@^1.2.3:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
-  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+array.prototype.flat@1.3.1, array.prototype.flat@^1.2.3:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"

-array.prototype.reduce@1.0.5, array.prototype.reduce@^1.0.6:
+array.prototype.reduce@1.0.5, array.prototype.reduce@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
   integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
@ yarn.lock:4443 @ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"

-es-abstract@^1.17.0-next.1, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.22.1, es-abstract@~1.21.2:
+es-abstract@^1.17.0-next.1, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2, es-abstract@~1.21.2:
   version "1.21.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.3.tgz#8aaa0ffc080e8a6fef6ace72631dc1ec5d47bf94"
   integrity sha512-ZU4miiY1j3sGPFLJ34VJXEqhpmL+HGByCinGHv4HC+Fxl2fI2Z4yR6tl0mORnDr6PA8eihWo4LmSWDbvhALckg==
@ yarn.lock:8005 @ object.entries@1.1.6, object.entries@^1.0.3:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"

-object.getownpropertydescriptors@^2.0.2, object.getownpropertydescriptors@^2.0.3:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz#7a466a356cd7da4ba8b9e94ff6d35c3eeab5d56a"
-  integrity sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==
+object.getownpropertydescriptors@2.1.6, object.getownpropertydescriptors@^2.0.2, object.getownpropertydescriptors@^2.0.3:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
+  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
   dependencies:
-    array.prototype.reduce "^1.0.6"
+    array.prototype.reduce "^1.0.5"
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    es-abstract "^1.21.2"
     safe-array-concat "^1.0.0"

 object.pick@^1.3.0:
@ yarn.lock:9935 @ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"

-string.prototype.padend@^3.0.0:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.5.tgz#311ef3a4e3c557dd999cdf88fbdde223f2ac0f95"
-  integrity sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==
+string.prototype.padend@3.1.4, string.prototype.padend@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.4.tgz#2c43bb3a89eb54b6750de5942c123d6c98dd65b6"
+  integrity sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"

 string.prototype.padstart@3.1.4, string.prototype.padstart@^3.0.0:
   version "3.1.4"
@ yarn.lock:9953 @ string.prototype.padstart@3.1.4, string.prototype.padstart@^3.0.0:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"

-string.prototype.trim@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
-  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+string.prototype.trim@1.2.7, string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"

-string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+string.prototype.trimend@1.0.6, string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"

 string.prototype.trimleft@^2.0.0:
   version "2.1.3"
@ yarn.lock:9989 @ string.prototype.trimright@^2.0.0:
     define-properties "^1.1.3"
     string.prototype.trimend "^1.0.3"

-string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
-  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+string.prototype.trimstart@1.0.6, string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"

 string_decoder@^1.1.1:
   version "1.3.0"

This commit builds on top of ManageIQ#1860 to add more package lockdowns in
order to prevent es-abstract 1.22 from being installed in the s390x
environment since that env has problems with it when run under yarn 1

(Reminder that we need yarn 1 for the time-being because builds on yarn
3 hang on s390x, however yarn 1 ignores the lockfile and installs the
latest version regardless, which sometimes brings in packages that are
problematic; in this case es-abstract 1.22)
@jrafanie
Copy link
Member

jrafanie commented Sep 8, 2023

Wow, 🤯

Copy link
Member

@jrafanie jrafanie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I don't know what these js dependencies are for but they mostly look like minor or patch updates. 🤞

@miq-bot
Copy link
Member

miq-bot commented Sep 8, 2023

Checked commit Fryguy@d72356f with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 🏆

@Fryguy
Copy link
Member Author

Fryguy commented Sep 8, 2023

@jrafanie That's correct but in the other direciton. We are locking down to the previous patch release, otherwise the newer patch release brings in es-abstract 1.22 which breaks on s390x. Strangely, I can't just straight for es-abstract 1.21, which is why we have to change everything that could end up bringing in 1.22 😞 See the diff in the OP, but specifically look at es-abstract in each section.

@jrafanie jrafanie merged commit f0a0710 into ManageIQ:master Sep 8, 2023
@Fryguy Fryguy deleted the s390x_lockdowns branch September 8, 2023 19:16
@Fryguy
Copy link
Member Author

Fryguy commented Sep 8, 2023

Backported to quinteros in commit 9adb9d8.

commit 9adb9d87d0de992e5d35892a3f27559246a14397
Author: Joe Rafaniello <jrafanie@users.noreply.github.com>
Date:   Fri Sep 8 15:16:08 2023 -0400

    Merge pull request #1861 from Fryguy/s390x_lockdowns
    
    More s390x lockdowns
    
    (cherry picked from commit f0a071078d5949d51464bc66a8ebaed9bec09866)

Fryguy pushed a commit that referenced this pull request Sep 8, 2023
More s390x lockdowns

(cherry picked from commit f0a0710)
Fryguy added a commit to Fryguy/manageiq-ui-service that referenced this pull request Dec 7, 2023
Now that we are on yarn 4.0.2, which can support newer versions of
es-abstract on s390x, this commit reverts all of the lockdowns to
packages for that reason.

This commit reverts cf484a2 (ManageIQ#1857), 95f6c55/68335b56 (ManageIQ#1860), and
d72356f (ManageIQ#1861)
@Fryguy Fryguy mentioned this pull request Dec 7, 2023
Fryguy added a commit to Fryguy/manageiq-ui-service that referenced this pull request Dec 7, 2023
Now that we are on yarn 4.0.2, which can support newer versions of
es-abstract on s390x, this commit reverts all of the lockdowns to
packages for that reason.

This commit reverts cf484a2 (ManageIQ#1857), 95f6c55 / 68335b5 (ManageIQ#1860), and
d72356f (ManageIQ#1861)
Fryguy added a commit to Fryguy/manageiq-ui-service that referenced this pull request Dec 7, 2023
Now that we are on yarn 4.0.2, which can support newer versions of
es-abstract on s390x, this commit reverts all of the lockdowns to
packages for that reason.

This commit reverts cf484a2 (ManageIQ#1857), 95f6c55 / 68335b5 (ManageIQ#1860), and
d72356f (ManageIQ#1861)
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants