The GitHub Actions job "CI - Groovy Joint Validation Build" on 
grails-core.git/8.0.x-hibernate7.gorm-scaling-clean has failed.
Run started by GitHub user borinquenkid (triggered by borinquenkid).

Head commit for run:
cd56ee0a7f091b23ab3f84c2a74fe8e16f2e55dc / Walter Duque de Estrada 
<[email protected]>
Merge origin/8.0.x into 8.0.x-hibernate7.gorm-scaling-clean

Resolves 15 merge conflicts introduced when the PR base was automatically
changed from 8.0.x-hibernate7 to 8.0.x.

Resolution strategy: prefer 8.0.x structure; preserve O(M+N) scaling
changes from HEAD.

Files resolved by taking 8.0.x (pure infra/test changes):
- gradlew.bat — improved Windows setlocal/exit handling
- GrailsDataHibernate5TckManager.groovy — simplified cast
- HibernateDatastoreSpringInitializerSpec.groovy — simplified withNewSession 
calls
- DistinctProjectionSpec.groovy — correct Person domain import
- DirtyCheckingAfterListenerSpec.groovy — remove duplicate imports
- GormEnhancerSpec.groovy — new getAll test coverage from 8.0.x
- NullValueEqualSpec.groovy — add H7 @IgnoreIf condition
- OneToManySpec.groovy — improved test naming
- OptimisticLockingSpec.groovy — improved @IgnoreIf style

Files resolved by manual merge (preserve O(M+N) content):
- HibernateEntity.groovy — keep findAllWithNativeSql/findWithNativeSql (new
  public API from HEAD); adopt 8.0.x currentHibernateStaticApi() helper;
  keep findAllWithSql/findWithSql non-deprecated per 8.0.x
- HibernateGormInstanceApi.groovy — take 8.0.x's isAttached/lock/attach with
  HibernateAttachSupport; remove duplicate methods left by HEAD reorganization
- HibernateGormStaticApi.groovy — merge-both: DatastoreResolver constructors,
  withNewSession(Serializable), eachTenant, withTenant from HEAD (O(M+N)
  multi-tenancy routing); doListInternal/doSingleInternal, findAllWithNativeSql,
  findWithNativeSql, event-firing query helpers from 8.0.x
- GrailsDataTckManager.groovy — keep HEAD's TransactionCapableDatastore and
  PlatformTransactionManager (O(M+N) test infra); prefer 8.0.x domain class list
- HibernateGormEnhancerSpec.groovy — correct package for 
HibernateGormDatastoreSpec
  (grails.gorm.tests); keep GormRegistry import (O(M+N) assertions)
- HibernateGormStaticApiSpec.groovy — correct Club package (grails.gorm.tests);
  keep GormRegistry + AvailableHints imports (both actively used); take 8.0.x
  improved test bodies with GString injection-safety test

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

Report URL: https://github.com/apache/grails-core/actions/runs/28179191068

With regards,
GitHub Actions via GitBox

Reply via email to