@@ -516,7 +516,7 @@ jobs:
516516
517517 Check Swift formatting :
518518 macos :
519- xcode : " 16.4 "
519+ xcode : " 26.2 "
520520 resource_class : " m4pro.medium"
521521 steps :
522522 - checkout
@@ -534,7 +534,7 @@ jobs:
534534
535535 iOS build and test :
536536 macos :
537- xcode : " 16.4 "
537+ xcode : " 26.2 "
538538 resource_class : " m4pro.medium"
539539 steps :
540540 - checkout
@@ -548,16 +548,16 @@ jobs:
548548 - setup-rust-toolchain
549549 - restore_cache :
550550 name : Restore rubygems cache
551- key : swift-docs-gems-v22
551+ key : swift-docs-gems-v23
552552 - run :
553553 name : Install jazzy
554554 command : gem install --no-document jazzy
555555 - save_cache :
556556 name : Save rubygems cache
557557 # NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
558- key : swift-docs-gems-v22
558+ key : swift-docs-gems-v23
559559 paths :
560- - ~/.rbenv/versions/3.4.3 /lib/ruby/gems/3.4.0
560+ - ~/.rbenv/versions/3.4.7 /lib/ruby/gems/3.4.0
561561 - run :
562562 name : Setup build environment
563563 command : |
@@ -573,7 +573,7 @@ jobs:
573573 DEVICES=$(xcrun xctrace list devices 2>&1)
574574 echo "$DEVICES"
575575 # Pick a device and start it
576- UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18 ' | awk -F'[()]' '{print $4}')
576+ UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26 ' | awk -F'[()]' '{print $4}')
577577 xcrun simctl boot "$UUID"
578578 # Store build type for use in cache key
579579 if [ -z "${CIRCLE_TAG}" ]; then
@@ -586,7 +586,7 @@ jobs:
586586 - v2-cargo-cache-{{arch}}-{{checksum "buildtype.txt"}}-{{checksum "Cargo.lock"}}
587587 - run :
588588 name : Run iOS build
589- command : bash bin/run-ios- build.sh
589+ command : make build-swift
590590 - save_cache :
591591 paths :
592592 - /Users/distiller/.cargo/registry
@@ -598,14 +598,14 @@ jobs:
598598 if git log -1 "$CIRCLE_SHA1" | grep -q '\[doc only\]'; then
599599 echo "Skipping this step. Last commit was tagged to not require tests."
600600 else
601- bash bin/run-ios-tests.sh
601+ make test-swift
602602 fi
603603 - run :
604604 name : Generate Swift documentation
605605 command : |
606606 # Skip doc generation for pull requests.
607607 if [ "$CIRCLE_BRANCH" = "main" ]; then
608- bash bin/build -swift-docs.sh
608+ make docs -swift
609609 else
610610 mkdir -p build/docs/swift
611611 fi
@@ -635,7 +635,7 @@ jobs:
635635
636636 iOS integration test :
637637 macos :
638- xcode : " 16.4 "
638+ xcode : " 26.2 "
639639 resource_class : " m4pro.medium"
640640 steps :
641641 - checkout
@@ -657,7 +657,7 @@ jobs:
657657 DEVICES=$(xcrun xctrace list devices 2>&1)
658658 echo "$DEVICES"
659659 # Pick a device and start it
660- UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18 ' | awk -F'[()]' '{print $4}')
660+ UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26 ' | awk -F'[()]' '{print $4}')
661661 xcrun simctl boot "$UUID"
662662 - run :
663663 name : Build XCFramework archive
@@ -666,21 +666,21 @@ jobs:
666666 - run :
667667 name : Build sample app
668668 command : |
669- bash bin/run-ios-sample-app- build.sh
669+ bin/iosbuild build sample
670670 - store_artifacts :
671671 path : raw_sample_xcodebuild.log
672672 destination : raw_sample_xcodebuild.log
673673 - run :
674674 name : Run sample app tests
675675 command : |
676- bash bin/run-ios-sample-app- test.sh
676+ bin/iosbuild test sample
677677 - store_artifacts :
678678 path : raw_sample_xcodetest.log
679679 destination : raw_sample_xcodetest.log
680680
681681 iOS Framework release :
682682 macos :
683- xcode : " 16.4 "
683+ xcode : " 26.2 "
684684 resource_class : " m4pro.medium"
685685 steps :
686686 - checkout
@@ -715,9 +715,6 @@ jobs:
715715 steps :
716716 - checkout
717717 - install-rustup
718- - run :
719- name : Run uniffi-bindgen
720- command : make bindgen-python
721718 - run :
722719 name : Python lints
723720 command : make lint-python
@@ -885,7 +882,7 @@ jobs:
885882 # Upload to GitHub
886883 ./ghr -replace ${CIRCLE_TAG} target/wheels
887884
888- pypi-linux-aarch64-release :
885+ pypi-linux-additional-releases :
889886 docker :
890887 - image : cimg/python:3.13
891888 steps :
@@ -898,19 +895,21 @@ jobs:
898895 make setup-python
899896 .venv3.13/bin/pip install ziglang
900897 - run :
901- name : Install aarch64-linux target
898+ name : Install additional targets
902899 command : |
903900 rustup target add aarch64-unknown-linux-gnu
901+ rustup target add aarch64-pc-windows-gnullvm
904902 - run :
905- name : Build Python package
903+ name : Build Python packages
906904 command : |
907- # We need a binary with debug symbols, so uniffi-bindgen can extract data
908- cargo build -p glean-bundle
909-
910905 . .venv3.13/bin/activate
911- make build-python-wheel GLEAN_BUILD_TARGET=aarch64-unknown-linux-gnu GLEAN_BUILD_EXTRA="--zig"
906+
907+ TARGETS="aarch64-unknown-linux-gnu aarch64-pc-windows-gnullvm"
908+ for target in $TARGETS; do
909+ make build-python-wheel GLEAN_BUILD_TARGET="$target" GLEAN_BUILD_EXTRA="--zig"
910+ done
912911 - run :
913- name : Upload aarch64-linux wheel
912+ name : Upload wheels
914913 command : |
915914 # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
916915 # variables are configured in CircleCI's environment variables.
@@ -924,7 +923,7 @@ jobs:
924923
925924 pypi-macos-release :
926925 macos :
927- xcode : " 16.4 "
926+ xcode : " 26.2 "
928927 resource_class : " m4pro.medium"
929928 steps :
930929 - install-rustup
@@ -979,43 +978,6 @@ jobs:
979978 # Upload to GitHub
980979 ./ghr -replace ${CIRCLE_TAG} target/wheels
981980
982- pypi-windows-aarch64-release :
983- docker :
984- - image : cimg/python:3.13
985- steps :
986- - install-rustup
987- - setup-rust-toolchain
988- - checkout
989- - run :
990- name : Setup Python env
991- command : |
992- make setup-python
993- .venv3.13/bin/pip install ziglang
994- - run :
995- name : Install aarch64-windows target
996- command : |
997- rustup target add aarch64-pc-windows-gnullvm
998- - run :
999- name : Build Python package
1000- command : |
1001- # We need a binary with debug symbols, so uniffi-bindgen can extract data
1002- cargo build -p glean-bundle
1003-
1004- . .venv3.13/bin/activate
1005- make build-python-wheel GLEAN_BUILD_TARGET=aarch64-pc-windows-gnullvm GLEAN_BUILD_EXTRA="--zig"
1006- - run :
1007- name : Upload aarch64-windows wheel
1008- command : |
1009- # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
1010- # variables are configured in CircleCI's environment variables.
1011- make upload-wheels
1012- - install-ghr-linux
1013- - run :
1014- name : Publish to GitHub
1015- command : |
1016- # Upload to GitHub
1017- ./ghr -replace ${CIRCLE_TAG} target/wheels
1018-
1019981 # ##########################################################################
1020982 # Docs
1021983
@@ -1215,7 +1177,7 @@ workflows:
12151177 requires :
12161178 - Python 3_9 tests
12171179 filters : *release-filters
1218- - pypi-linux-aarch64-release :
1180+ - pypi-linux-additional-releases :
12191181 requires :
12201182 - Python 3_9 tests
12211183 filters : *release-filters
@@ -1227,10 +1189,6 @@ workflows:
12271189 requires :
12281190 - Python 3_9 tests
12291191 filters : *release-filters
1230- - pypi-windows-aarch64-release :
1231- requires :
1232- - Python 3_9 tests
1233- filters : *release-filters
12341192 - iOS build and test :
12351193 filters : *release-filters
12361194 - iOS Framework release :
0 commit comments