Merge branch 'main' into develop

io7m-com · Oct 2, 2024 · cf22902 · cf22902
2 parents 7233643 + 8541e6c
commit cf22902
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 2 deletions.
diff --git a/.github/workflows/deploy.linux.temurin.lts.yml b/.github/workflows/deploy.linux.temurin.lts.yml
@@ -25,10 +25,13 @@ jobs:
           java-version: 21
           distribution: temurin
 
+      - name: Check PGP version
+        run: gpg --version
+
       - name: Import signing key
         env:
           PGP_SIGNING_KEY: ${{ secrets.PGP_SIGNING_KEY }}
-        run: echo "${PGP_SIGNING_KEY}" | gpg --import
+        run: echo "${PGP_SIGNING_KEY}" | gpg -v --import
 
       - name: Log in to Quay.io.
         uses: redhat-actions/[email protected]

diff --git a/.github/workflows/main.linux.temurin.current.yml b/.github/workflows/main.linux.temurin.current.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs
@@ -44,7 +47,7 @@ jobs:
           path: ./com.io7m.garriga.tests/target/surefire-reports
 
       - name: Coverage
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: com.io7m.garriga.tests/target/site/jacoco-aggregate/jacoco.xml

diff --git a/.github/workflows/main.windows.temurin.current.yml b/.github/workflows/main.windows.temurin.current.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/main.windows.temurin.lts.yml b/.github/workflows/main.windows.temurin.lts.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/pr.linux.temurin.current.yml b/.github/workflows/pr.linux.temurin.current.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/pr.linux.temurin.lts.yml b/.github/workflows/pr.linux.temurin.lts.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/pr.windows.temurin.current.yml b/.github/workflows/pr.windows.temurin.current.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs

diff --git a/.github/workflows/pr.windows.temurin.lts.yml b/.github/workflows/pr.windows.temurin.lts.yml
@@ -33,7 +33,10 @@ jobs:
         id: project_is_snapshot
         run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT"
 
+
       - name: Build
+        env:
+          XOANON_REALLY_USE_LOCAL_DISPLAY: true
         run: mvn --batch-mode --strict-checksums --errors clean verify site
 
       - name: Upload test logs