Skip to content

Commit f075de5

Browse files
committed
Update CI tests to skip rules_ios
1 parent b65ce61 commit f075de5

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

buildbuddy.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,20 @@ actions:
137137
- *validate_integration
138138
- *build_all
139139

140-
- name: Integration Test - "examples/rules_ios" - Bazel Previous LTS
141-
<<: *bazel_previous_lts
142-
<<: *arm64
143-
<<: *action_base
144-
<<: *normal_resources
145-
<<: *examples_rules_ios_workspace
146-
bazel_commands:
147-
# Not validate since Bazel 7 Bzlmod paths are different
148-
- *generate_integration
149-
- *build_all
140+
# TODO: rules_ios directly depends on index-import's old repository name
141+
# this needs to be fixed, for now disable testing it:
142+
# https://github.com/bazel-ios/rules_ios/blob/c10a34996da36e1196d287b5493c0d7caf182987/MODULE.bazel#L94
143+
# - name: Integration Test - "examples/rules_ios" - Bazel Previous LTS
144+
# <<: *bazel_previous_lts
145+
# <<: *arm64
146+
# <<: *action_base
147+
# <<: *normal_resources
148+
# <<: *examples_rules_ios_workspace
149+
# bazel_commands:
150+
# # Not validate since Bazel 7 Bzlmod paths are different
151+
# - *generate_integration
152+
# - *build_all
153+
150154
## Uncomment once rules_ios supports Bazel 8
151155
# - name: Integration Test - "examples/rules_ios" - Bazel LTS
152156
# <<: *bazel_lts

test/update_all_fixtures.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,25 @@ set -euo pipefail
55
root="$PWD"
66

77
for dir in examples/*/ ; do
8+
# TODO: rules_ios directly depends on index-import's old repository name
9+
# this needs to be fixed, for now disable testing it:
10+
# https://github.com/bazel-ios/rules_ios/blob/c10a34996da36e1196d287b5493c0d7caf182987/MODULE.bazel#L94
11+
if [[ "$dir" == "examples/rules_ios/" ]]; then
12+
continue
13+
fi
14+
815
cd "$root/$dir"
916
if [[ ! -f "WORKSPACE" || ! -d "test/fixtures" ]]; then
1017
continue
1118
fi
1219

20+
# TODO: rules_ios only supports up-to Bazel 7.x
1321
if [[ "$dir" == "examples/rules_ios/" ]]; then
14-
bazel_version="7.4.1"
15-
else
16-
# See https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3029
17-
#
18-
# Temporary change to make CI pass until the fix is in `last_green`
19-
bazel_version="dd2464a5933e0a5a6765024573832717b71989bf"
22+
overriden_bazel_version="7.4.1"
2023
fi
2124

2225
echo
2326
echo "Updating \"${dir%/}\" fixtures"
2427
echo
25-
USE_BAZEL_VERSION="$bazel_version" bazel run --config=cache //test/fixtures:update
28+
USE_BAZEL_VERSION="${overriden_bazel_version:-}" bazel run --config=cache //test/fixtures:update
2629
done

0 commit comments

Comments
 (0)