move dash to use pre-compiled jars

locationtech · Nov 11, 2024 · 96fc366 · 96fc366
1 parent 3d983aa
commit 96fc366
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 24 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -166,3 +166,8 @@ jobs:
     uses: ./.github/workflows/javadocs.yml
     with:
       scala-version: ${{ inputs.scala-version }}
+  dash:
+    needs: compile
+    uses: ./.github/workflows/dash.yml
+    with:
+      scala-version: ${{ inputs.scala-version }}
diff --git a/.github/workflows/dash.yml b/.github/workflows/dash.yml
@@ -0,0 +1,48 @@
+name: dash
+
+on:
+  workflow_call:
+    inputs:
+      scala-version:
+        required: false
+        type: string
+        default: "2.12"
+
+permissions:  # added using https://github.com/step-security/secure-repo
+  contents: read
+
+env:
+  MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dlicense.skip=true --batch-mode
+
+jobs:
+  dependency-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        with:
+          key: ${{ hashFiles('**/pom.xml') }}-dash-${{ inputs.scala-version }}
+          path: ~/.m2/repository/
+      - name: Set Scala version
+        run: ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
+      - name: Download artifacts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: classes-and-jars-${{ inputs.scala-version }}
+      - name: Install artifacts
+        run: |
+          tar -xf classes.tgz
+          mkdir -p ~/.m2/repository/org/locationtech/geomesa
+          mv m2-geomesa/* ~/.m2/repository/org/locationtech/geomesa/
+      - name: License check
+        run: mvn org.eclipse.dash:license-tool-plugin:license-check $MAVEN_CLI_OPTS -Pdash -Ddash.fail=true -Ddash.projectId=locationtech.geomesa -DexcludeGroupIds=org.locationtech.geomesa
+      - name: Show license
+        if: success() || failure()
+        run: cat target/dash/summary
+      - name: Remove geomesa artifacts
+        if: success() || failure()
+        run: rm -rf ~/.m2/repository/org/locationtech/geomesa
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -48,30 +48,6 @@ jobs:
       - name: Remove geomesa artifacts
         if: success() || failure()
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
-  check-dependency-licenses:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
-        with:
-          key: ${{ hashFiles('**/pom.xml') }}-dash
-          path: |
-            ~/.m2/repository/
-            build/zinc-0.3.15/
-      - name: Build with Maven
-        run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
-      - name: License check
-        run: mvn org.eclipse.dash:license-tool-plugin:license-check $MAVEN_CLI_OPTS -Pdash -Ddash.fail=true -Ddash.projectId=locationtech.geomesa -DexcludeGroupIds=org.locationtech.geomesa
-      - name: Show license
-        if: success() || failure()
-        run: cat target/dash/summary
-      - name: Remove geomesa artifacts
-        if: success() || failure()
-        run: rm -rf ~/.m2/repository/org/locationtech/geomesa
   check-license-headers:
     runs-on: ubuntu-latest
     steps: