Skip to content

Commit 501ecec

Browse files
acozzettecopybara-github
authored andcommittedSep 26, 2023
Reorganize upb file structure
This change moves almost everything in the `upb/` directory up one level, so that for example `upb/upb/generated_code_support.h` becomes just `upb/generated_code_support.h`. The only exceptions I made to this were that I left `upb/cmake` and `upb/BUILD` where they are, mostly because that avoids conflict with other files and the current locations seem reasonable for now. The `python/` directory is a little bit of a challenge because we had to merge the existing directory there with `upb/python/`. I made `upb/python/BUILD` into the BUILD file for the merged directory, and it effectively loads the contents of the other BUILD file via `python/build_targets.bzl`, but I plan to clean this up soon. PiperOrigin-RevId: 568651768
1 parent 30a7b23 commit 501ecec

File tree

454 files changed

+1889
-1854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+1889
-1854
lines changed
 

‎.github/BUILD.bazel

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66
# of Xcode.
77
xcode_version(
88
name = "version14_2_14C18",
9-
version = "14.2.14C18",
109
aliases = ["14C18"],
1110
default_ios_sdk_version = "16.2",
12-
default_tvos_sdk_version = "16.1",
1311
default_macos_sdk_version = "13.1",
12+
default_tvos_sdk_version = "16.1",
1413
default_watchos_sdk_version = "9.1",
14+
version = "14.2.14C18",
1515
)
1616

1717
xcode_version(
1818
name = "version14_1_0_14B47b",
19-
version = "14.1.0.14B47b",
2019
aliases = ["14B47b"],
2120
default_ios_sdk_version = "16.1",
22-
default_tvos_sdk_version = "16.1",
2321
default_macos_sdk_version = "13.0",
22+
default_tvos_sdk_version = "16.1",
2423
default_watchos_sdk_version = "9.1",
24+
version = "14.1.0.14B47b",
2525
)
2626

2727
xcode_config(
2828
name = "host_xcodes",
29-
versions = [":version14_2_14C18", ":version14_1_0_14B47b"],
3029
default = ":version14_1_0_14B47b",
30+
versions = [
31+
":version14_2_14C18",
32+
":version14_1_0_14B47b",
33+
],
3134
)

‎.github/workflows/test_python.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
version: ["3.8", "3.9", "3.10", "3.11" ]
2121
include:
2222
- type: Pure
23-
targets: //python/... //upb/python/... //python:python_version_test
23+
targets: //python/... //python:python_version_test
2424
flags: --define=use_fast_cpp_protos=false
2525
- type: C++
2626
targets: //python/... //python:python_version_test
@@ -46,6 +46,7 @@ jobs:
4646
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
4747
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
4848
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_PYTHON_VERSION
49+
exclude-targets: -//python/pb_unit_tests/...
4950

5051

5152
macos:
@@ -57,7 +58,7 @@ jobs:
5758
version: [ "3.11" ]
5859
include:
5960
- type: Pure
60-
targets: //python/... //upb/python/... //python:python_version_test
61+
targets: //python/... //python:python_version_test
6162
- type: C++
6263
targets: //python/... //python:python_version_test
6364
flags: --define=use_fast_cpp_protos=true
@@ -95,3 +96,4 @@ jobs:
9596
test ${{ matrix.targets }} ${{ matrix.flags }}
9697
--test_env=KOKORO_PYTHON_VERSION=${{ matrix.version }}
9798
--macos_minimum_os=10.9
99+
exclude-targets: -//python/pb_unit_tests/...

0 commit comments

Comments
 (0)
Please sign in to comment.