Merge branch 'master' into topic/oliolopp/editor/single-click-selection

.github/workflows/gradle-build-master.yml → .github/workflows/acceptance-master.yml

@@ -1,4 +1,4 @@
-name: Unit Tests, Quality checks, and Acceptance Tests
+name: Acceptance Tests
 
 on:
   push:
@@ -18,13 +18,11 @@ jobs:
       with:
         java-version: 17
         distribution: 'temurin'
-    - uses: gradle/wrapper-validation-action@v3
-      name: validate gradle wrapper
-    - uses: gradle/actions/setup-gradle@v3
+    - uses: gradle/actions/setup-gradle@v4
       name: Setup Gradle
       id: setup-gradle
-    - name: Run gradle build
-      run: xvfb-run -a --server-args='-screen 0, 1024x768x24' ./gradlew -PenvIsCi --scan build
+    - name: Run acceptance test
+      run: ./gradlew -PenvIsCi=true -PtestDisplay=99 --scan testAcceptance
       id: gradle
     - name: "Add Build Scan URL as PR comment"
       uses: actions/github-script@v7

.github/workflows/checkstyle-annotate.yml

@@ -18,7 +18,7 @@ jobs:
         java-version: '11'
     - name: create annotation
       run: echo "::add-matcher::${{ github.workspace }}/ci/github/problem-matcher.json"
+    - name: setup gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: run checkstyle
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        arguments: -PenvIsCi checkstyleMain checkstyleTest
+      run: ./gradlew -PenvIsCi checkstyleMain checkstyleTest

.github/workflows/gradle-check-master.yml

@@ -0,0 +1,39 @@
+name: Quality checks
+
+on:
+  push:
+    branches:
+      - master
+      - releases/*
+  pull_request:
+
+jobs:
+  gradle:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
+    - uses: gradle/actions/setup-gradle@v4
+      name: Setup Gradle
+      id: setup-gradle
+    - name: Run gradle build
+      run: ./gradlew -PenvIsCi=true -Pheadless=true --scan check
+      id: gradle
+    - name: "Add Build Scan URL as PR comment"
+      uses: actions/github-script@v7
+      if: github.event_name == 'pull_request' && failure()
+      with:
+        github-token: ${{secrets.GITHUB_TOKEN}}
+        script: |
+          github.rest.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: `❌ ${{ github.workflow }} **failed**.
+
+             Please look a Gradle Scan page for details: 
+             ${{ steps.gradle.outputs.build-scan-url }}`
+          })

.github/workflows/gradle-wrapper-validate.yml

@@ -0,0 +1,12 @@
+name: Validate gradle wrapper
+
+on:
+  pull_request:
+
+jobs:
+  gradle:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: gradle/wrapper-validation-action@v3
+      name: validate gradle wrapper

.github/workflows/greetings-builds-master.yml

@@ -0,0 +1,24 @@
+name: Chec greetings build
+
+on:
+  push:
+    branches:
+      - master
+      - releases/*
+  pull_request:
+
+jobs:
+  gradle:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
+    - uses: gradle/actions/setup-gradle@v4
+      name: Setup Gradle
+      id: setup-gradle
+    - name: Run gradle firstSteps
+      run: ./gradlew -PenvIsCi=true firstSteps
+      id: gradle

.github/workflows/manuals-builds-master.yml

@@ -0,0 +1,24 @@
+name: Check manuals build
+
+on:
+  push:
+    branches:
+      - master
+      - releases/*
+  pull_request:
+
+jobs:
+  gradle:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
+    - uses: gradle/actions/setup-gradle@v4
+      name: Setup Gradle
+      id: setup-gradle
+    - name: Run gradle manualsHtmls
+      run: ./gradlew -PenvIsCi=true manualHtmls
+      id: gradle

.github/workflows/spotbugs-annotate.yml

@@ -18,7 +18,7 @@ jobs:
         java-version: '11'
     - name: create annotation
       run: echo "::add-matcher::${{ github.workspace }}/ci/github/problem-matcher.json"
+    - name: setup gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: run spotbugs
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        arguments: --continue -PenvIsCi spotbugsMain spotbugsTest
+      run: ./gradlew --continue -PenvIsCi spotbugsMain spotbugsTest

.gitignore

@@ -10,6 +10,7 @@ bin
 local.properties
 
 .idea
+.fleet
 .run
 out
 

aligner/build.gradle

@@ -4,13 +4,18 @@ plugins {
 
 dependencies {
     compileOnly(project.rootProject)
-    if (providedLibsDir.directory) {
-        compileOnly fileTree(dir: providedLibsDir, includes: ['**/commons-*.jar', '**/lib-mnemonics*.jar',
-                                                              '**/maligna-*.jar', '**/supertmxmerge-*.jar',
-                                                              '**/slf4j*'])
+    if (providedModuleLibsDir.directory) {
+        compileOnly fileTree(dir: providedCoreLibsDir, includes: ['**/commons-*.jar', '**/lib-mnemonics*.jar',
+            '**/slf4j*.jar', '**/supertmxmerge-*.jar', '**/jaxb-api*.jar'])
+        compileOnly fileTree(dir: providedModuleLibsDir, includes: ['**/maligna-*.jar'])
     } else {
         // Aligner
-        implementation(libs.loomchild.maligna)
+        implementation(libs.loomchild.maligna) {
+            exclude module: 'jaxb-api'
+            exclude module: 'jaxb-core'
+            exclude module: 'jaxb-runtime'
+        }
+        compileOnly(libs.jaxb.api)
         compileOnly(libs.madlonkay.supertmxmerge)
         compileOnly(libs.omegat.mnemonics)
         compileOnly(libs.commons.io)

azure-pipelines.yml

@@ -140,10 +140,20 @@ stages:
       - checkout: self
         fetchDepth: 1
         fetchTags: false
+      - template: ci/azure-pipelines/build_steps.yml
+      - script: echo "##vso[task.setvariable variable=result;]false"
+        condition: failed()
       - script: |
           version=$(./gradlew -qq printVersion | head -n -1 )
           echo "##vso[task.setvariable variable=version]$version"
-      - template: ci/azure-pipelines/build_steps.yml
+          # stop the Gradle daemon to ensure no files are left open (impacting the save cache operation later)
+          ./gradlew --stop
+          # Check task result
+          if [[ "$(result)" == "false" ]]; then
+            exit 1
+          fi
+        condition: always()
+        displayName: Stop Gradle daemon
       - template: ci/azure-pipelines/publish_weekly.yml
         parameters:
           omegatVersion: $(version)
@@ -168,10 +178,20 @@ stages:
       - checkout: self
         fetchDepth: 0
         fetchTags: true
+      - template: ci/azure-pipelines/build_steps.yml
+      - script: echo "##vso[task.setvariable variable=result;]false"
+        condition: failed()
       - script: |
           version=$(./gradlew -qq printVersion | head -n -1 )
           echo "##vso[task.setvariable variable=version]$version"
-      - template: ci/azure-pipelines/build_steps.yml
+          # stop the Gradle daemon to ensure no files are left open (impacting the save cache operation later)
+          ./gradlew --stop
+          # Check task result
+          if [[ "$(result)" == "false" ]]; then
+            exit 1
+          fi
+        condition: always()
+        displayName: Stop Gradle daemon
       - template: ci/azure-pipelines/publish_release.yml
         parameters:
           omegatVersion: $(version)