Resolve merge conflict

Friendseeker · Jan 2, 2024 · df7d45c · df7d45c
2 parents 3f9d838 + e3ccfde
commit df7d45c
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,3 +64,20 @@ jobs:
       shell: bash
       run: |
         sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Shapeless.*" "runBenchmarks"
+    - name: Checkout Develop Branch (4, 5)
+      if: ${{ github.event_name == 'pull_request' && (matrix.jobtype == 4 || matrix.jobtype == 5) }}
+      uses: actions/checkout@v4
+      with:
+        clean: false
+        ref: develop
+    - name: Benchmark (Scalac) against Develop Branch (4)
+      if: ${{ github.event_name == 'pull_request' && matrix.jobtype == 4 }}
+      shell: bash
+      run: |
+        sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Scalac.*" "runBenchmarks"
+    - name: Benchmark (Shapeless) against Develop Branch (5)
+      if: ${{ github.event_name == 'pull_request' && matrix.jobtype == 5 }}
+      shell: bash
+      run: |
+        sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Shapeless.*" "runBenchmarks"
+