Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump bazel to 7.1.0 and related rules #341

Closed
wants to merge 13 commits into from
11 changes: 9 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,14 @@ mobile-install --start=warm

build:ci --build_metadata=ROLE=CI --workspace_status_command=./scripts/workspace-status.sh

# Circle xlarge has 8 CPU cores/16GB mem
build:ci --config="release"
# Circle machines have 8 cores
build:ci --local_cpu_resources=8
# Circle xlarge has 8 CPU cores/16GB mem
build:ci --local_ram_resources=15000
build:ci --config="release"
# Circle macos.m1.large.gen1 has 12gb ram
build:ci-mac --config=ci --local_ram_resources=11000
coverage:ci-mac --config=ci --local_ram_resources=11000

build:release --stamp --workspace_status_command=./scripts/workspace-status.sh

Expand Down Expand Up @@ -97,3 +101,6 @@ fetch --@aspect_rules_ts//ts:skipLibCheck=always
query --@aspect_rules_ts//ts:skipLibCheck=always

try-import %workspace%/.bazelrc.local

# Bug with Aspect Rules to silence issues about dep checking directories -> https://github.com/aspect-build/rules_js/issues/1408
startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0
7.1.0
30 changes: 19 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,27 @@ jobs:
platform: "iOS"
device: "iPhone 15"


- run:
name: Clean
command: |
bazel clean && bazel shutdown

- run:
name: Core Prebuild
command: |
bazel build \
--config=ci-mac \
$(bazel query 'filter("_native_bundle", //plugins/...)') \
$(bazel query 'filter("_native_bundle", //core/...)')

- run: bazel build --config=ci -- //ios/demo:PlayerUIDemo

- run:
name: Test Prebuild
command: |
bazel build \
--config=ci \
--config=ci-mac \
$(bazel query "kind(ios_unit_test, //ios/...)") \
$(bazel query "kind(ios_unit_test, //plugins/...)") \
$(bazel query "kind(ios_ui_test, //ios/...)") \
Expand All @@ -137,7 +151,7 @@ jobs:
name: Tests
command: |
bazel coverage \
--config=ci \
--config=ci-mac \
--jobs=2 \
--experimental_use_llvm_covmap \
--combined_report=lcov \
Expand Down Expand Up @@ -333,10 +347,8 @@ workflows:
branches:
ignore:
- /pull\/.*/
context:
- applitools
requires:
- bazelrc
- build-trunk

- build_ios:
name: build-ios-fork
Expand All @@ -345,7 +357,7 @@ workflows:
only:
- /pull\/.*/
requires:
- setup
- build-fork

- maybe_release:
filters:
Expand Down Expand Up @@ -426,10 +438,8 @@ workflows:
- setup

- build_ios:
context:
- applitools
requires:
- setup
- build

- android_test:
context:
Expand Down Expand Up @@ -461,8 +471,6 @@ workflows:
- setup

- build_ios:
context:
- applitools
requires:
- setup

Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git_override(
# local_path_override(module_name = "rules_player", path = "../rules_player")

bazel_dep(name = "aspect_bazel_lib", version = "1.32.0")
bazel_dep(name = "aspect_rules_js", version = "1.34.1")
bazel_dep(name = "aspect_rules_js", version = "1.41.1")
bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_pkg", version = "0.9.1")
bazel_dep(name = "aspect_rules_ts", version = "2.1.0")
Expand All @@ -26,7 +26,7 @@ node.toolchain(node_version = "18.18.0")
## Rule Dependencies
bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift")
bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "rules_ios", version = "4.3.1", repo_name = "build_bazel_rules_ios")
bazel_dep(name = "rules_ios", version = "4.4.0", repo_name = "build_bazel_rules_ios")
bazel_dep(name = "rules_xcodeproj", version = "2.2.0")

bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
Expand Down
Loading