Skip to content
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.

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

ci: Cleanup #1014

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion build/workflow/stage-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- template: templates/dotnet-workload-install-windows.yml
- template: templates/canary-updater.yml
- template: templates/gitversion.yml
- template: templates/set-app-versions.yml

- task: DownloadSecureFile@1
name: keyStore
Expand All @@ -46,7 +47,7 @@ jobs:
- script: |
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
dotnet build -f net7.0-android -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
dotnet build -f net7.0-android -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
displayName: Build project for Release - (net7.0-android)
condition: eq(variables['System.PullRequest.IsFork'],'True')

Expand Down
9 changes: 5 additions & 4 deletions build/workflow/stage-build-ios.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jobs:
- job: iOS

timeoutInMinutes: 90
timeoutInMinutes: 90

strategy:
maxParallel: 2
Expand All @@ -20,7 +20,7 @@ jobs:
CI_Build: true
pool:
vmImage: 'macOS-12'

variables:
- group: unoplatform.apple.ios.appstore.distribution

Expand All @@ -32,7 +32,7 @@ jobs:
certPwd: '$(appleappstorecertificatepassword)'
keychain: temp
deleteCert: true

- task: InstallAppleProvisioningProfile@1
displayName: 'Install Apple Provisioning Profile (UWP)'
condition: eq(variables['IsCanaryBranch'], false)
Expand Down Expand Up @@ -64,6 +64,7 @@ jobs:
- template: templates/dotnet-workload-install-mac.yml
- template: templates/canary-updater.yml
- template: templates/gitversion.yml
- template: templates/set-app-versions.yml

- bash: |
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
Expand Down Expand Up @@ -96,4 +97,4 @@ jobs:
retryCountOnTaskFailure: 3
condition: always()
inputs:
ArtifactName: $(ArtifactName)
ArtifactName: $(ArtifactName)
8 changes: 0 additions & 8 deletions build/workflow/stage-build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ jobs:
- template: templates/gitversion.yml
- template: templates/dotnet-workload-install-windows.yml

# This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
- powershell: .\build\Install-WindowsSdkISO.ps1 19041
displayName: Install Windows SDK 19041

- task: MSBuild@1
displayName: 'Build Packages'
inputs:
Expand All @@ -22,10 +18,6 @@ jobs:
maximumCpuCount: true
msbuildArguments: /m /v:m /r /p:GeneratePackageOnBuild=true /p:UseDotNetNativeToolchain=false /p:AotAssemblies=false "/p:PackageVersion=$(GitVersion.FullSemVer)" "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/toolkit-build-packages.binlog

- task: DotNetCoreInstaller@0
inputs:
version: '2.1.504'

- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/stage-validations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
inputs:
versionSpec: '18.x'

- bash: npm install -g cspell
- bash: npm install -g cspell@8.3.2
displayName: Install cSpell

- bash: cspell --config $(Build.SourcesDirectory)/build/workflow/cspell.json "**/*.md" "**/toc.yml" --no-progress
Expand All @@ -35,7 +35,7 @@ jobs:
inputs:
versionSpec: '18.x'

- bash: npm install -g markdownlint-cli
- bash: npm install -g markdownlint-cli@0.38.0
displayName: Install markdownlint-cli

- bash: markdownlint -c $(Build.SourcesDirectory)/build/workflow/.markdownlint.json "**/*.md"
Expand Down
17 changes: 1 addition & 16 deletions build/workflow/templates/gitversion.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@

steps:
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 5.0.3'
inputs:
packageType: runtime
version: 5.0.3

# Restore nuget.org to the list of existing sources, .NET 6 Pre 2 may somehow remove it
- powershell: |
dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org | Out-Null
$global:LASTEXITCODE = 0
displayName: Adjust nuget.org source

- task: gitversion/setup@0
inputs:
versionSpec: '5.6.6'
versionSpec: '5.10.3'

- task: gitversion/execute@0
inputs:
updateAssemblyInfo: 'False'
useConfigFile: true
configFilePath: gitversion.yml
displayName: Use GitVersion

- template: set-app-versions.yml
Loading