🌱 Swap to @rollup/wasm-node for multiarch builds #1739
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
sjd78
added
the
cherry-pick/release-0.3
sjd78
added a commit
to sjd78/tackle2-ui
that referenced
this pull request
Mar 5, 2024
Following up on PRs konveyor#1664 and konveyor#1739, downgrade to `rollup@^3.0`. The v4 of rollup has "native" code that runs the build, and that code does not currently work with s390 builds [1]. Since konveyor is built for x86, arm, ppc, and s390, all of those need to work. When the s390 builds can work with the wasm bits, we can upgrade to `rollup@^4.0` again. [1] - rollup/rollup#5354 Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
sjd78
added a commit
that referenced
this pull request
Mar 5, 2024
Following up on PRs #1664 and #1739, downgrade to `rollup@^3.0`. The v4 of rollup has "native" code that runs the build, and that code does not currently work with s390 builds [1]. Since konveyor is built for x86, arm, ppc, and s390, all of those need to work. When the s390 builds can work with the wasm bits, we can upgrade to `rollup@^4.0` again. [1] - rollup/rollup#5354 Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
sjd78
added a commit
that referenced
this pull request
Mar 14, 2024
Following up on PRs #1664 and #1739, downgrade to `rollup@^3.0`. The v4 of rollup has "native" code that runs the build, and that code does not currently work with s390 builds [1]. Since konveyor is built for x86, arm, ppc, and s390, all of those need to work. When the s390 builds can work with the wasm bits, we can upgrade to `rollup@^4.0` again. [1] - rollup/rollup#5354 Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
sjd78
pushed a commit
that referenced
this pull request
Mar 15, 2024
…1738) ## Summary Refactor and enhance branding capabilities. Now branding is included from a single directory that contains at least `strings.json`, `manifest.json`, and `favicon.ico`. Any other assets may be placed in the directory and will be copied to the bundled app. Running the build as normal should show no difference. Running the build with `BRANDING=./some-other-brand npm run start:dev` will try to use a branding from the specified directory (that is relative to the project's source root). See `BRANDING.md` for more details. Resolves: #1682 ## Details Branding changes: - Move Konveyor branding assets to a project top-level branding directory - Remove MTA branding assets - Remove profile/branding constants from `env` and client module - Embed branding strings and assets in the common module - `strings.json` is templated to allow the build to adjust asset URL path roots as necessary - `brandingAssetPath()` - server's index.html generation sources the template strings from the common module's branding strings - `HeaderApp` and `AppAboutModal` components support branding by using the `useBranding` hook - `BRANDING` as a relative path is computed from the project root - webpack build source branding assets directly from the common module - Unit tests, snapshots and jest configs updated as necessary Jest changes: - Use `react-i18next` mock from `client/__mocks__` as a more robust mock borrowed from react-i18n repos - Move `setupTests.ts` into `client/src/app/test-config` to keep jest test config code all in the same directory Related changes: - add new rollup plugins (copy, virtual) ## Downgrade to rollup v3 for multiarch builds (#1742) As a followup on PRs #1664 and #1739, it became necessary to downgrade back to `rollup@^3.0`. The v4 of rollup has "native" code that runs the build, and that code does not currently work with s390 builds [1]. Since konveyor is built for x86, arm, ppc, and s390, all of those need to work. When the s390 builds can work with the wasm bits, we can upgrade to `rollup@^4.0` again. [1] - rollup/rollup#5354 --------- Signed-off-by: Scott J Dickerson <sdickers@redhat.com> Signed-off-by: Cherry Picker <noreply@github.com> Co-authored-by: Ian Bolton <ibolton@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On merge to main, #1664 showed that the normal rollup package does not support the linux-ppc64 platform. This was not caught earlier as building on github actions always worked with the standard
rolluppackage. The error message displayed on the multiarch build attempt is:Swapping the package
rollupto@rollup/wasm-nodeshould enable the ppc64 build.