Skip to content

Commit 41b63af

Browse files
gavinkinggavinking
authored
Merge branch 'main' into HHH-18737
2 parents 82de1e5 + e4cba2c commit 41b63af

File tree

1,336 files changed

+49669
-16231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,336 files changed

+49669
-16231
lines changed

‎.gitattributes‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
* text eol=lf
1+
# By default, detect text files automatically, and use whatever line terminators make sense for the OS
2+
* text=auto eol=lf
3+
4+
# Java files are text, and we want Java-friendly readable hunk headers for diff
5+
*.java text diff=java eol=lf
6+
7+
# Force LF/CRLF format for files that are known to require it.
8+
*.sh text eol=lf
9+
*.bat text eol=crlf
10+
11+
# For some reason the above is not enough, in particular for gradlew.bat,
12+
# as some commands (git status, git add --renormalize) will still change its line endings to LF.
13+
# So, we explicitly tell git not to mess with *.bat line endings.
14+
# It's annoying as git won't show diffs for these files anymore,
15+
# but that's the best I could come up with after an hour of head-scratching.
16+
*.bat binary
17+

‎.github/ci-prerequisites-atlas.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Reclaims disk space and sanitizes user home on Atlas infrastructure
2+
3+
# We use the GitHub cache for the relevant parts of these directories.
4+
# Also, we do not want to keep things like ~/.gradle/build-scan-data.
5+
rm -rf ~/.gradle/
6+
rm -rf ~/.m2/

‎.github/hibernate-github-bot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ jira:
55
ignoreFiles:
66
# Git
77
- ".git*"
8+
- "*/.git*"
89
- ".mailmap"
910
# Gradle
1011
- "gradlew*"
@@ -19,6 +20,7 @@ jira:
1920
- "ci/"
2021
- "databases/"
2122
- "*.sh"
23+
- "*.bat"
2224
- "Jenkinsfile"
2325
- "*/Jenkinsfile"
2426
- "*.Jenkinsfile"
@@ -37,6 +39,8 @@ jira:
3739
- "release/"
3840
- "rules/"
3941
- "shared/"
42+
- ".sdkmanrc"
43+
- "*/.sdkmanrc"
4044
develocity:
4145
buildScan:
4246
addCheck: true

‎.github/workflows/atlas.yml‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.github/workflows/ci-report.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: GH Actions CI reporting
2+
3+
on:
4+
workflow_run:
5+
workflows: [ "GH Actions CI" ]
6+
types: [ completed ]
7+
8+
defaults:
9+
run:
10+
shell: bash
11+
12+
jobs:
13+
publish-build-scans:
14+
name: Publish Develocity build scans
15+
if: github.repository == 'hibernate/hibernate-orm' && github.event.workflow_run.conclusion != 'cancelled'
16+
runs-on: ubuntu-latest
17+
steps:
18+
# Checkout target branch which has trusted code
19+
- name: Check out target branch
20+
uses: actions/checkout@v4
21+
with:
22+
persist-credentials: false
23+
ref: ${{ github.ref }}
24+
- name: Set up Java 17
25+
uses: actions/setup-java@v4
26+
with:
27+
distribution: 'temurin'
28+
java-version: '17'
29+
30+
- name: Generate cache key
31+
id: cache-key
32+
run: |
33+
CURRENT_BRANCH="${{ github.repository != 'hibernate/hibernate-orm' && 'fork' || github.base_ref || github.ref_name }}"
34+
CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
35+
CURRENT_DAY=$(/bin/date -u "+%d")
36+
ROOT_CACHE_KEY="buildtool-cache"
37+
echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
38+
echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
39+
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
40+
- name: Restore Maven/Gradle Dependency/Dist Caches
41+
uses: actions/cache/restore@v4
42+
with:
43+
path: |
44+
~/.m2/repository/
45+
~/.m2/wrapper/
46+
~/.gradle/caches/modules-2
47+
~/.gradle/wrapper/
48+
key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
49+
restore-keys: |
50+
${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
51+
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
52+
53+
- name: Download GitHub Actions artifacts for the Develocity build scans
54+
id: downloadBuildScan
55+
uses: actions/download-artifact@v4
56+
with:
57+
pattern: build-scan-data-*
58+
github-token: ${{ github.token }}
59+
repository: ${{ github.repository }}
60+
run-id: ${{ github.event.workflow_run.id }}
61+
path: /tmp/downloaded-build-scan-data/
62+
# Don't fail the build if there are no matching artifacts
63+
continue-on-error: true
64+
- name: Publish Develocity build scans for previous builds
65+
if: ${{ steps.downloadBuildScan.outcome != 'failure'}}
66+
run: |
67+
shopt -s nullglob # Don't run the loop below if there are no artifacts
68+
status=0
69+
mkdir -p ~/.gradle/
70+
for build_scan_data_directory in /tmp/downloaded-build-scan-data/*
71+
do
72+
rm -rf ~/.gradle/build-scan-data
73+
mv "$build_scan_data_directory" ~/.gradle/build-scan-data \
74+
&& ./gradlew --no-build-cache buildScanPublishPrevious || status=1
75+
done
76+
exit $status
77+
env:
78+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY_PR }}

0 commit comments

Comments
 (0)