Skip to content

Bump tiler for separate M1 macOS goldens + update Cirrus to use M1 Macs #214

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jan 23, 2023
Merged

Bump tiler for separate M1 macOS goldens + update Cirrus to use M1 Macs #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
074b3a9
Bump tiler for separate M1 macOS goldens
DanTup Jan 21, 2023
a89162a
Switch Cirrus to M1 Macs
DanTup Jan 23, 2023
4b1fbd0
Use 14.2
DanTup Jan 23, 2023
4c506a0
First try using the cloned version
DanTup Jan 23, 2023
c758137
Use Flutter from the image and just switch to master channel
DanTup Jan 23, 2023
100bee6
Revert "Use Flutter from the image and just switch to master channel"
DanTup Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ task:
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
script: scripts/verify_tests_on_master.sh --shards 2 --shard-index 0
osx_instance:
image: mojave-base
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2

task:
name: tests-macos-1
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
script: scripts/verify_tests_on_master.sh --shards 2 --shard-index 1
osx_instance:
image: mojave-base
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2

task:
name: skp_generator
Expand Down
2 changes: 1 addition & 1 deletion registry/DanTup_tiler.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

[email protected]
fetch=git clone https://github.com/DanTup/tiler.git tests
fetch=git -C tests checkout 570364385b43c84b20a1d46b87344f3c9ae08aab
fetch=git -C tests checkout 3cb0cad96cc393b85cf7e38c4623cc16390f906e
fetch=git -C tests submodule init
fetch=git -C tests submodule update --recursive
update=.
Expand Down
4 changes: 3 additions & 1 deletion scripts/verify_tests_on_master.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ git clone https://github.com/flutter/flutter.git || GOTO :END
CALL flutter\bin\flutter doctor -v || GOTO :END
@ECHO ON

SET PATH=%PATH%;%CD%\flutter/bin;%CD%\flutter\bin\cache\dart-sdk\bin
# Put Flutter at the start of the PATH because the OS image may contain
# another version of Flutter.
SET PATH=%CD%\flutter/bin;%CD%\flutter\bin\cache\dart-sdk\bin;%PATH%

@ECHO.
@ECHO.
Expand Down
4 changes: 3 additions & 1 deletion scripts/verify_tests_on_master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ done
git clone https://github.com/flutter/flutter.git
flutter/bin/flutter doctor -v

export PATH="$PATH":`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin
# Put Flutter at the start of the PATH because the OS image may contain
# another version of Flutter.
export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:"$PATH"

cd flutter/dev/customer_testing
dart pub get
Expand Down