Skip to content

Commit 7c7a47c

Browse files
committed
Make the 7.1 branch a limited maintenance branch like 6.6
1 parent f619eac commit 7c7a47c

File tree

5 files changed

+15
-431
lines changed

5 files changed

+15
-431
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: GH Actions CI
22

33
on:
4-
push:
5-
branches:
6-
# Pattern order matters: the last matching inclusion/exclusion wins
7-
- '7.1'
8-
# We don't want to run CI on branches for dependabot, just on the PR.
9-
- '!dependabot/**'
104
pull_request:
115
branches:
126
- '7.1'

.github/workflows/codeql.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: "CodeQL"
22

33
on:
4-
push:
5-
branches: [ '7.1' ]
64
pull_request:
75
# The branches below must be a subset of the branches above
86
branches: [ '7.1' ]

Jenkinsfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ stage('Configure') {
4040
// Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
4141
// new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
4242
new BuildEnvironment( node: 's390x' ),
43+
new BuildEnvironment( dbName: 'sybase_jconn' ),
4344
// We generally build with JDK 21, but our baseline is Java 17, so we test with JDK 17, to be sure everything works.
4445
// Here we even compile the main code with JDK 17, to be sure no JDK 18+ classes are depended on.
4546
new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
4647
// We want to enable preview features when testing newer builds of OpenJDK:
4748
// even if we don't use these features, just enabling them can cause side effects
4849
// and it's useful to test that.
49-
new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
5050
new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
5151
// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:
5252
// they require the use of -Dnet.bytebuddy.experimental=true.
@@ -97,17 +97,17 @@ if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
9797
currentBuild.result = 'NOT_BUILT'
9898
return
9999
}
100+
// This is a limited maintenance branch, so don't run this on pushes to the branch, only on PRs
101+
if ( !env.CHANGE_ID ) {
102+
print "INFO: Build skipped because this job should only run for pull request, not for branch pushes"
103+
currentBuild.result = 'NOT_BUILT'
104+
return
105+
}
100106

101107
stage('Build') {
102108
Map<String, Closure> executions = [:]
103109
Map<String, Map<String, String>> state = [:]
104110
environments.each { BuildEnvironment buildEnv ->
105-
// Don't build environments for newer JDKs when this is a PR, unless the PR is labelled with 'jdk' or 'jdk-<version>'
106-
if ( helper.scmSource.pullRequest &&
107-
buildEnv.testJdkVersion && buildEnv.testJdkVersion.toInteger() > DEFAULT_JDK_VERSION.toInteger() &&
108-
!pullRequest.labels.contains( 'jdk' ) && !pullRequest.labels.contains( "jdk-${buildEnv.testJdkVersion}" ) ) {
109-
return
110-
}
111111
state[buildEnv.tag] = [:]
112112
executions.put(buildEnv.tag, {
113113
runBuildOnNode(buildEnv.node ?: NODE_PATTERN_BASE) {
@@ -208,6 +208,9 @@ stage('Build') {
208208
}
209209
})
210210
}
211+
executions.put('Hibernate Search Update Dependency', {
212+
build job: '/hibernate-search-dependency-update/8.0', propagate: true, parameters: [string(name: 'UPDATE_JOB', value: 'orm7'), string(name: 'ORM_REPOSITORY', value: helper.scmSource.remoteUrl), string(name: 'ORM_PULL_REQUEST_ID', value: helper.scmSource.pullRequest.id)]
213+
})
211214
parallel(executions)
212215
}
213216

ci/jpa-3.2-tck.Jenkinsfile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@ if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
66
currentBuild.result = 'NOT_BUILT'
77
return
88
}
9-
def throttleCount
10-
// Don't build the TCK on PRs, unless they use the tck label
11-
if ( env.CHANGE_ID != null ) {
12-
if ( !pullRequest.labels.contains( 'tck' ) ) {
13-
print "INFO: Build skipped because pull request doesn't have 'tck' label"
14-
return
15-
}
16-
throttleCount = 20
17-
}
18-
else {
19-
throttleCount = 1
9+
// This is a limited maintenance branch, so don't run this on pushes to the branch, only on PRs
10+
if ( !env.CHANGE_ID ) {
11+
print "INFO: Build skipped because this job should only run for pull request, not for branch pushes"
12+
currentBuild.result = 'NOT_BUILT'
13+
return
2014
}
2115

2216
pipeline {
@@ -25,7 +19,6 @@ pipeline {
2519
jdk 'OpenJDK 21 Latest'
2620
}
2721
options {
28-
rateLimitBuilds(throttle: [count: throttleCount, durationName: 'day', userBoost: true])
2922
buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
3023
disableConcurrentBuilds(abortPrevious: true)
3124
}

0 commit comments

Comments
 (0)