Adds matrix based testing for example script using various bazel versions (#300)

* Adds matrix based testing for example script using various bazel versions

Enhances this testing across bazel versions

* remove bazel 9 for now

* more updates

* flag update

* more updates

* more updates

* bump bazelversion

* flags

* default to bzlmod

* only 8 for external test

* test

* more test fixes

* lock

* more updates

* update more github actions

* remove no impacted targets test

* upload logs

* update java

* more test updates

* more e2e fixes

* more updates

* updates to actions

* enhance e2e test debugging

* filtering for bazel-dfif targets in e2e

Author: tinder-maxwellelliott

.bazelversion

@@ -1 +1 @@
-7.3.2
+8.5.1

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 jobs:
-  test-jre21-bzlmod:
+  test-jre21:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java JDK
@@ -24,27 +24,26 @@ jobs:
         run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
       - uses: actions/checkout@v4
       - name: Run bazel-diff tests
-        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/... --enable_bzlmod=true
-  test-jre21:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v4
+        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/... --enable_bzlmod=true --enable_workspace=false
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v4
+        if: always()
         with:
-          distribution: 'temurin'
-          java-version: '21'
-      - name: Setup Go environment
-        uses: actions/setup-go@v5
+          name: coverage-report-jre21
+          path: bazel-out/_coverage/_coverage_report.dat
+          if-no-files-found: warn
+      - name: Upload test logs
+        uses: actions/upload-artifact@v4
+        if: always()
         with:
-          go-version: ^1.17
-        id: go
-      - name: Setup Bazelisk
-        run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
-      - uses: actions/checkout@v4
-      - name: Run bazel-diff tests
-        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/... --enable_bzlmod=false
+          name: test-logs-jre21
+          path: bazel-testlogs/
+          if-no-files-found: warn
   test-jre11-run-example:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        bazel: ['7.x', '8.x']
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
@@ -63,6 +62,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Run bazel-diff example script
+        env:
+          USE_BAZEL_VERSION: ${{ matrix.bazel }}
+          BAZEL_DIFF_DISABLE_WORKSPACE: ${{ matrix.bazel == '8.x' && 'true' || 'false' }}
+          BAZEL_DIFF_FORCE_CHECKOUT: true
         run: ./bazel-diff-example.sh "$GITHUB_WORKSPACE" ~/go/bin/bazelisk $(git rev-parse HEAD~1) $(git rev-parse HEAD)
   deploy:
     needs: [test-jre21]

.github/workflows/integration_external_target.yml

@@ -13,7 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11' ]
+        bazel: ['8.x']
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v3
@@ -26,9 +27,21 @@ jobs:
           repository: tinder-maxwellelliott/bazel-diff-repro-1
           ref: master
           fetch-depth: 0
-      - name: Set bazel version
-        run: echo "USE_BAZEL_VERSION=7.3.1" > "$HOME/.bazeliskrc"
       - name: Run External Target Impact test
+        env:
+          USE_BAZEL_VERSION: ${{ matrix.bazel }}
+          BAZEL_DIFF_DISABLE_WORKSPACE: ${{ matrix.bazel == '8.x' && 'true' || 'false' }}
+          BAZEL_DIFF_FORCE_CHECKOUT: true
         run: ./bazel-diff.sh $(pwd) bazel $(git rev-parse HEAD~1) $(git rev-parse HEAD)
       - name: Validate Impacted Targets
         run: grep -q "//:yo" /tmp/impacted_targets.txt
+      - name: Upload bazel-diff artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: bazel-diff-artifacts-java-${{ matrix.java }}-bazel-${{ matrix.bazel }}
+          path: |
+            /tmp/impacted_targets.txt
+            /tmp/bazel-diff*.log
+            /tmp/bazel-diff*.json
+          if-no-files-found: warn

.github/workflows/integration_no_impacted_targets.yml

@@ -1,14 +1,15 @@
 module(
     name = "bazel-diff",
-    version = "12.1.1",
+    version = "13.0.0",
     compatibility_level = 0,
 )
 
 bazel_dep(name = "rules_license", version = "1.0.0", dev_dependency = True)
 bazel_dep(name = "aspect_rules_lint", version = "1.0.2", dev_dependency = True)
+
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_proto", version = "7.1.0")
-bazel_dep(name = "rules_java", version = "8.11.0")
+bazel_dep(name = "rules_java", version = "8.14.0")
 bazel_dep(name = "rules_kotlin", version = "2.1.3")
 bazel_dep(name = "rules_jvm_external", version = "6.7")