Add composite actions to merge queue workflows

CROSSINGTUD · Nov 20, 2024 · 9dbbe79 · 9dbbe79
1 parent 051d48a
commit 9dbbe79
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 88 deletions.
diff --git a/.github/workflows/merge_queue_mac.yml b/.github/workflows/merge_queue_mac.yml
@@ -10,47 +10,35 @@ jobs:
   # This name must be equal to the corresponding build_and_test action
   build-and-test-analysis:
     runs-on: macos-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test Analysis
+        uses: ./.github/actions/analysis
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
+
+  # This name must be equal to the corresponding build_and_test job
+  build-and-test-scanner-android:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+      - name: Build and test Android Scanner
+        uses: ./.github/actions/scanner-android
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunAnalysisTests
+          java-version: ${{ env.JAVA_VERSION }}
 
-  # This name must be equal to the corresponding build_and_test action
+  # This name must be equal to the corresponding build_and_test job
   build-and-test-scanner-soot:
     runs-on: macos-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test JavaScanner with Soot
+        uses: ./.github/actions/scanner-soot
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunSootTests
diff --git a/.github/workflows/merge_queue_ubuntu.yml b/.github/workflows/merge_queue_ubuntu.yml
@@ -10,47 +10,35 @@ jobs:
   # This name must be equal to the corresponding build_and_test job
   build-and-test-analysis:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test Analysis
+        uses: ./.github/actions/analysis
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
+
+  # This name must be equal to the corresponding build_and_test job
+  build-and-test-scanner-android:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+      - name: Build and test Android Scanner
+        uses: ./.github/actions/scanner-android
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunAnalysisTests
+          java-version: ${{ env.JAVA_VERSION }}
 
   # This name must be equal to the corresponding build_and_test job
   build-and-test-scanner-soot:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test JavaScanner with Soot
+        uses: ./.github/actions/scanner-soot
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunSootTests
diff --git a/.github/workflows/merge_queue_windows.yml b/.github/workflows/merge_queue_windows.yml
@@ -10,47 +10,35 @@ jobs:
   # This name must be equal to the corresponding build_and_test job
   build-and-test-analysis:
     runs-on: windows-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test Analysis
+        uses: ./.github/actions/analysis
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
+
+  # This name must be equal to the corresponding build_and_test job
+  build-and-test-scanner-android:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+      - name: Build and test Android Scanner
+        uses: ./.github/actions/scanner-android
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunAnalysisTests
+          java-version: ${{ env.JAVA_VERSION }}
 
   # This name must be equal to the corresponding build_and_test job
   build-and-test-scanner-soot:
     runs-on: windows-latest
+
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
-      # Sets up Java version
-      - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+      - name: Build and test JavaScanner with Soot
+        uses: ./.github/actions/scanner-soot
         with:
-          distribution: 'adopt'
-          java-package: jdk
           java-version: ${{ env.JAVA_VERSION }}
-      # Restores Maven dependecies
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Run maven command
-        run: mvn clean verify -DrunSootTests