Skip to content

Commit bb77532

Browse files
gavinkinggavinking
authored
Merge branch 'main' into bug/HHH-15480
2 parents 5537196 + dbbe61c commit bb77532

File tree

17,421 files changed

+815591
-318094
lines changed

Some content is hidden

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

17,421 files changed

+815591
-318094
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Initial commits that enabled spotless automatic formatting
2+
59731c089e9d649a663c81d9622b54557d6aba37
3+
4d63ffd98cdead513ab0be0fa23f9787423092d3

‎.gitattributes‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--
2+
If this is your first time contributing to the project, please consider reviewing https://github.com/hibernate/hibernate-orm/blob/main/CONTRIBUTING.md
3+
-->
4+
5+
[Please describe here what your change is about]
6+
7+
<!--
8+
Please read and do not remove the following lines:
9+
-->
10+
----------------------
11+
By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0.txt)
12+
and can be relicensed under the terms of the [LGPL v2.1 license](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt) in the future at the maintainers' discretion.
13+
For more information on licensing, please check [here](https://github.com/hibernate/hibernate-orm/blob/main/CONTRIBUTING.md#legal).
14+
15+
----------------------

‎.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/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ updates:
1414
- gradle-plugin-portal
1515
schedule:
1616
interval: "weekly"
17+
- package-ecosystem: github-actions
18+
directory: "/"
19+
schedule:
20+
interval: daily

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
11
---
22
jira:
33
projectKey: "HHH"
4+
insertLinksInPullRequests: true
5+
ignoreFiles:
6+
# Git
7+
- ".git*"
8+
- "*/.git*"
9+
- ".mailmap"
10+
# Gradle
11+
- "gradlew*"
12+
- "gradle/"
13+
- "local-build-plugins/"
14+
- "build.gradle"
15+
# NOT settings.gradle: contains dependency versions, changing those requires a Jira issue
16+
- "utilities.gradle"
17+
# CI
18+
- ".github/"
19+
- ".release/"
20+
- "ci/"
21+
- "databases/"
22+
- "*.sh"
23+
- "*.bat"
24+
- "Jenkinsfile"
25+
- "*/Jenkinsfile"
26+
- "*.Jenkinsfile"
27+
# In-repo documentation
28+
- "design/"
29+
- "README.adoc"
30+
- "MAINTAINERS.md"
31+
- "CONTRIBUTING.md"
32+
# Misc. build files
33+
- "checkerstubs/"
34+
- "drivers/"
35+
- "edb/"
36+
- "etc/"
37+
- "javadoc/"
38+
- "patched-libs/"
39+
- "release/"
40+
- "rules/"
41+
- "shared/"
42+
- ".sdkmanrc"
43+
- "*/.sdkmanrc"
44+
develocity:
45+
buildScan:
46+
addCheck: true
47+
tags:
48+
- column: "OS"
49+
pattern: "Linux"
50+
- column: "OS"
51+
pattern: "Windows.*"
52+
replacement: "Windows"
53+
- column: "Java"
54+
pattern: "jdk-(.*)"
55+
replacement: "$1"
56+
- column: "Java"
57+
pattern: "s390x"
58+
replacement: "$0"
59+
- column: "DB"
60+
pattern: "((?:h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:.*(?=_ci)|.*))(?:_ci)?"
61+
replacement: "$1"
62+
- pattern: "main|HEAD|\\d+.\\d+|PR-\\d+"
63+
replacement: "" # Just remove these tags

‎.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)