more updates

Author: tinder-maxwellelliott

.github/workflows/ci.yaml

@@ -42,8 +42,18 @@ jobs:
   test-jre11-run-example:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        bazel: ['7.x', '8.x']
+        include:
+          - bazel: '7.x'
+            disable_workspace: 'false'
+            extra_flags: ''
+          - bazel: '8.x'
+            disable_workspace: 'true'
+            extra_flags: ''
+          - bazel: '7.x'
+            disable_workspace: 'false'
+            extra_flags: '--incompatible_disable_native_repo_rules'
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
@@ -64,35 +74,7 @@ jobs:
       - 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)
-  test-example-with-incompatible-flags:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: incompatible_disable_native_repo_rules
-            extra_flags: "--incompatible_disable_native_repo_rules"
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - name: Setup Go environment
-        uses: actions/setup-go@v5
-        with:
-          go-version: ^1.17
-      - name: Setup Bazelisk
-        run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Run bazel-diff example with incompatible flags (${{ matrix.name }})
-        env:
-          USE_BAZEL_VERSION: '7.x'
+          BAZEL_DIFF_DISABLE_WORKSPACE: ${{ matrix.disable_workspace }}
           BAZEL_DIFF_FORCE_CHECKOUT: true
           BAZEL_EXTRA_COMMAND_OPTIONS: ${{ matrix.extra_flags }}
         run: ./bazel-diff-example.sh "$GITHUB_WORKSPACE" ~/go/bin/bazelisk $(git rev-parse HEAD~1) $(git rev-parse HEAD)