Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Enforce pick-up of linux.riscv64 root-files in equinox.executable.feature #680

Merged

Conversation

HannesWell
Copy link
Member

This allows to pick-up the new root-files for linux.riscv64 contributed via #669.

This should unblock eclipse-platform/eclipse.platform.releng.aggregator#2394 and should be reverted once that is submitted and has passed an I-build, together with

<!-- Temporary work-around until gtk.linux.riscv64 environment is enabled in general. -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<environments combine.children="append">
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>riscv64</arch>
</environment>
</environments>
</configuration>
</plugin>

Without this the root files for linux.riscv64 are removed during baseline-replacement because tycho-p2-plugin:p2-metadata#baselineReplace has the value all by default, which means: Replace build artifacts with baseline version. Attached artifacts only present in the build are removed.

The reason this wasn't necessary for win32.aarch64 in #559 is probably because eclipse-platform/eclipse.platform.releng.aggregator#577 was submitted before the next I-build happened and therefore the different qualifier of the o.e.equinox.executable.feature prevented a baseline replacement.

Copy link

github-actions bot commented Sep 29, 2024

Test Results

  660 files  ±0    660 suites  ±0   1h 14m 42s ⏱️ - 2m 11s
2 201 tests ±0  2 154 ✅ ±0   47 💤 ±0  0 ❌ ±0 
6 747 runs  ±0  6 604 ✅ ±0  143 💤 ±0  0 ❌ ±0 

Results for commit 27f22b0. ± Comparison against base commit abde0eb.

♻️ This comment has been updated with latest results.

This qualifier-bump ensures that the new root-files for linux.riscv64
are picked up in the I-build with the linux.riscv64 environment enabled.
Support for linux.riscv64 was contributed via
eclipse-equinox#669
@HannesWell HannesWell force-pushed the executable-keep-new-artifacts branch from 3a5808e to 27f22b0 Compare September 29, 2024 11:16
@HannesWell
Copy link
Member Author

Without this the root files for linux.riscv64 are removed during baseline-replacement because tycho-p2-plugin:p2-metadata#baselineReplace has the value all by default, which means: Replace build artifacts with baseline version. Attached artifacts only present in the build are removed.

Looks like this that didn't work after all, so I just went on with a simple enforced qualifier update for the o.e.equinox.executable.feature.

@HannesWell HannesWell changed the title Keep new artifacts during baseline-replace in equinox.executable.feature Pick up linux.riscv64 root-files in equinox.executable.feature Sep 29, 2024
@HannesWell HannesWell changed the title Pick up linux.riscv64 root-files in equinox.executable.feature Enforce pick-up of linux.riscv64 root-files in equinox.executable.feature Sep 29, 2024
@HannesWell
Copy link
Member Author

Verification with eclipse-platform/eclipse.platform.releng.aggregator#2394 succeeded.

@HannesWell HannesWell merged commit 84eb966 into eclipse-equinox:master Sep 29, 2024
26 of 27 checks passed
@HannesWell HannesWell deleted the executable-keep-new-artifacts branch September 29, 2024 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant