Skip to content

Commit 05cb954

Browse files
committed
Merge branch 'ci/gitlab-square-mac-arm' into 'main'
Move GitLab CI jobs running on MacOS to ARM architecture See merge request Sharpmake/sharpmake!626
2 parents 78bb4d2 + ee83371 commit 05cb954

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.gitlab/.gitlab-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ include:
44
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
55
- project: 'Sharpmake/SharpmakeExtended'
66
file: 'build/sharpmake-ci.yml'
7-
7+
- project: 'Square/Runners/ci/templates/square-runners-mac-ci-template'
8+
file: 'square_mac_runner.yml'
9+
ref: '6.0.0'
810
stages:
911
- build
1012
- test
@@ -38,8 +40,11 @@ compilation:windows:
3840
extends: .compilation:base
3941

4042
compilation:mac:
41-
extends: .compilation:base
42-
tags: [square_mac]
43+
extends:
44+
- .compilation:base
45+
- .square_mac_arm_macos15
46+
47+
tags: [square_mac_arm]
4348

4449
compilation:linux:
4550
extends: .compilation:base

.gitlab/Get-SamplesPipeline.ps1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ System.String
1414
$samplesDef = Get-Content -Raw -Path 'SamplesDef.json' | ConvertFrom-Json
1515

1616
# Transform into a hash table with an entry for each samples.
17-
$samplesPipeline = @{}
17+
$samplesPipeline = @{
18+
include = @{
19+
project = "Square/Runners/ci/templates/square-runners-mac-ci-template"
20+
ref = "6.0.0"
21+
file = "square_mac_runner.yml"
22+
}
23+
}
24+
1825
foreach ($sample in $samplesDef.Samples)
1926
{
2027
if ($sample.CIs.Contains('gitlab'))
@@ -59,7 +66,7 @@ foreach ($sample in $samplesDef.Samples)
5966
'macos'
6067
{
6168
$osProperties = @{
62-
tags = @( 'square_mac' )
69+
extends = @( '.square_mac_arm_xcode16' )
6370
}
6471
$osCompilationName = 'mac'
6572
}

SamplesDef.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,9 @@
538538
"Commands":
539539
[
540540
"xcodebuild -version",
541+
"Measure-Command { xcodebuild -downloadPlatform iOS }",
541542
"./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloIOS.Main.sharpmake.cs\" -framework {framework}",
542-
"xcodebuild build-for-testing CODE_SIGNING_ALLOWED=NO -workspace {testFolder}/codebase/temp/solutions/HelloIOS_iOS.xcworkspace -configuration {configuration} -scheme exe_iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' test -derivedDataPath {testFolder}/test"
543+
"xcodebuild build-for-testing CODE_SIGNING_ALLOWED=NO -workspace {testFolder}/codebase/temp/solutions/HelloIOS_iOS.xcworkspace -configuration {configuration} -scheme exe_iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' test -derivedDataPath {testFolder}/test"
543544
]
544545
},
545546
{

0 commit comments

Comments
 (0)