build: apply workaround for gradle bug (#210)

eclipse-edc · Jan 19, 2024 · 805af19 · 805af19
1 parent 9517b62
commit 805af19
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 93 deletions.
diff --git a/.github/actions/bump-version/action.yml b/.github/actions/bump-version/action.yml
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-build
+      - uses: eclipse-edc/.github/.github/actions/setup-build@main
 
       - name: Run Checkstyle
         run: ./gradlew checkstyleMain checkstyleTest
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-build
+      - uses: eclipse-edc/.github/.github/actions/setup-build@main
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/release-all-java.yml b/.github/workflows/release-all-java.yml
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/bump-version
+      - uses: eclipse-edc/.github/.github/actions/bump-version@main
         with:
           target_branch: "main"
           base_version: ${{ needs.Prepare-Release.outputs.metamodel-version }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -20,10 +20,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-build
+      - uses: eclipse-edc/.github/.github/actions/setup-build@main
 
       - name: Run unit tests
-        uses: ./.github/actions/run-tests
+        uses: eclipse-edc/.github/.github/actions/run-tests@main
         with:
           command: ./gradlew test
 

diff --git a/.github/workflows/trigger_snapshot.yml b/.github/workflows/trigger_snapshot.yml
@@ -4,10 +4,10 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   Publish-Snapshot:
     # This workflow will abort if the required secrets don't exist
     uses: eclipse-edc/.github/.github/workflows/publish-snapshot.yml@main
     secrets: inherit
-
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -57,4 +57,10 @@ allprojects {
             from("${rootProject.projectDir.path}/LICENSE")
         }
     }
+
+    // FIXME - workaround for https://github.com/gradle/gradle/issues/26091
+    val signingTasks = tasks.withType<Sign>()
+    tasks.withType<AbstractPublishToMaven>().configureEach {
+        mustRunAfter(signingTasks)
+    }
 }