Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into build_python_zip
Browse files Browse the repository at this point in the history
  • Loading branch information
thesayyn committed Sep 3, 2024
2 parents f54b06a + 5142191 commit b71cc13
Show file tree
Hide file tree
Showing 47 changed files with 595 additions and 17,175 deletions.
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
e2e/
examples/uv_pip_compile
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
7.0.2
7.1.0
# The first line of this file is used by Bazelisk and Bazel to be sure
# the right version of Bazel is used to build and test this repo.
# This also defines which version is used on CI.
Expand Down
3 changes: 3 additions & 0 deletions .bcr/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@ bcr_test_module:
name: "Run test module"
bazel: ${{ bazel }}
platform: ${{ platform }}
test_flags:
# Bazel 6.x requires this flag set.
- --@aspect_rules_py//py:interpreter_version=3.8.12
test_targets:
- "//..."
19 changes: 11 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
test:
uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6
with:
folders: '[".", "e2e/smoke", "e2e/repository-rule-deps", "e2e/system-interpreter"]'
folders: '[".", "e2e/smoke", "e2e/repository-rule-deps", "e2e/system-interpreter", "examples/uv_pip_compile"]'
# TODO: Build Windows tools and add to toolchain
# TODO(alex): switch the root folder to bzlmod
exclude: |
Expand All @@ -30,7 +30,9 @@ jobs:
{"folder": ".", "bazelversion": "6.4.0"},
{"folder": ".", "bzlmodEnabled": true},
{"folder": "e2e/repository-rule-deps", "bzlmodEnabled": false},
{"folder": "e2e/system-interpreter", "bzlmodEnabled": false}
{"folder": "e2e/system-interpreter", "bzlmodEnabled": false},
{"folder": "examples/uv_pip_compile", "bzlmodEnabled": false},
{"folder": "examples/uv_pip_compile", "bazelversion": "6.4.0"},
]
verify-bcr-patches:
Expand All @@ -39,9 +41,10 @@ jobs:
- uses: actions/checkout@v4
- run: patch --dry-run -p1 < .bcr/patches/*.patch

test-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- working-directory: e2e/use_release
run: ./minimal_download_test.sh
# TODO(alex): enable after next release. Matt will yell at you if you forget.
# test-release:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - working-directory: e2e/use_release
# run: ./minimal_download_test.sh
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: .github/workflows/release_prep.sh > release_notes.txt

- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
prerelease: true
# Use GH feature to populate the changelog automatically
Expand Down
Loading

0 comments on commit b71cc13

Please sign in to comment.