Skip to content

Conversation

@yrodiere
Copy link
Member

This is a backport of #9163 #9165 #9166 #9173 and I think one other commit that was pushed directly to main (sorry).


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.


beikov and others added 8 commits October 28, 2024 16:51
* Use `pull_request` instead of `pull_request_target`
* Move Develocity build scan publishing for untrusted code to a separate workflow
* Merge Atlas workflow into the main CI workflow
* Split caches between trusted and untrusted code
* Update secrets to use "Develocity" name instead of "Gradle Enterprise"
* Update comments

Co-Authored-By: Yoann Rodière <[email protected]>
(cherry picked from commit df8b163)
So that we're extra sure we're not relying on cache left by a previous
Gradle execution.

(cherry picked from commit 543e095)
Ripped off from Quarkus.

Here's how it will work:

1. We create a cache entry on push only. Pull requests only restore it.
2. We create a new cache entry every day, prefixed with something like
   2024-10-25.
3. When restoring the cache, we try the entry for the day first
   (2024-10-25) and default to the one for the month (2024-10-*).
   Critically, this means we will build each day's cache based on the
   previous day's cache.
4. Atlas infra uses its own, separate cache entries.

Co-Authored-By: Guillaume Smet <[email protected]>
(cherry picked from commit 5eaaff2)
We don't need the whole cache, since most (all?) of it is stored on
Develocity already.

Including ./gradle/caches/modules-2 is enough, because that's where
Maven dependencies are stored, and *those* are not stored on Develocity.

(cherry picked from commit 013bb46)
Don't tar them, as this was broken: we ended up uploading the
build-scan-data directory instead of the tar, while still expecting a
tar when dowloading, which made everything fail.

We don't need tars anyway, as workflow artifacts are already zipped.

(cherry picked from commit 6551aa5)
Forgot this line.

(cherry picked from commit a63716d)
@yrodiere yrodiere requested a review from beikov October 28, 2024 15:54
@hibernate-github-bot
Copy link

hibernate-github-bot bot commented Oct 28, 2024

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
    ↳ Offending commits: [ff95967]

› This message was automatically generated.

Copy link
Member

@beikov beikov left a comment

Choose a reason for hiding this comment

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

LGTM

@yrodiere yrodiere changed the title Backport GitHub Actions rework from main to 6.6 Backport CI improvements from main to 6.6 Oct 28, 2024
@beikov beikov merged commit 5328e83 into hibernate:6.6 Oct 28, 2024
39 of 40 checks passed
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.

2 participants