Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.2
8.5.1
39 changes: 21 additions & 18 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ master ]

jobs:
test-jre21-bzlmod:
test-jre21:
runs-on: ubuntu-latest
steps:
- name: Setup Java JDK
Expand All @@ -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
Expand All @@ -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]
Expand Down
19 changes: 16 additions & 3 deletions .github/workflows/integration_external_target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
39 changes: 0 additions & 39 deletions .github/workflows/integration_no_impacted_targets.yml

This file was deleted.

5 changes: 3 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Loading
Loading