Skip to content

Commit 8231484

Browse files
committed
Update Azure Pipelines config
1 parent abeb692 commit 8231484

File tree

1 file changed

+23
-28
lines changed

1 file changed

+23
-28
lines changed

azure-pipelines.yml

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variables:
66
GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git
77
PROJECT_GENERATOR_VERSION: 2
88
REPOSITORY_DIR: $(System.DefaultWorkingDirectory)
9+
DISABLE_X86_64_BUILD: false
910
trigger:
1011
batch: true
1112
branches:
@@ -24,15 +25,15 @@ jobs:
2425
displayName: Windows
2526
pool:
2627
name: Azure Pipelines
27-
vmImage: windows-2019
28+
vmImage: windows-2022
2829
timeoutInMinutes: 10
2930
variables:
3031
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
3132
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1
32-
COMPILER_PLATFORM: vs2019
33+
COMPILER_PLATFORM: vs2022
3334
PROJECT_OS: windows
3435
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
35-
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-windows.zip
36+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-windows.zip
3637
steps:
3738
- checkout: self
3839
clean: true
@@ -45,23 +46,22 @@ jobs:
4546
- task: CopyFiles@2
4647
displayName: 'Copy files to $(Build.ArtifactStagingDirectory)'
4748
inputs:
48-
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2019'
49+
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2022'
4950
Contents: '*/Release/*.dll'
5051
TargetFolder: '$(Build.ArtifactStagingDirectory)'
5152
CleanTargetFolder: true
5253
flattenFolders: true
5354
preserveTimestamp: true
54-
- task: PublishBuildArtifacts@1
55-
displayName: 'Publish build artifacts'
56-
inputs:
57-
ArtifactName: windows
55+
- publish: '$(Build.ArtifactStagingDirectory)'
56+
displayName: 'Publish Windows binaries'
57+
artifact: windows
5858
- job: linux
5959
displayName: Linux
6060
pool:
6161
name: Azure Pipelines
62-
vmImage: ubuntu-latest
62+
vmImage: ubuntu-22.04
6363
container:
64-
image: registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest
64+
image: danielga/steamrt-scout:latest
6565
options: -v /home
6666
timeoutInMinutes: 10
6767
variables:
@@ -70,7 +70,7 @@ jobs:
7070
COMPILER_PLATFORM: gmake
7171
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
7272
PROJECT_OS: linux
73-
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-linux.tar.gz
73+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-linux.tar.gz
7474
CC: gcc-9
7575
CXX: g++-9
7676
AR: gcc-ar-9
@@ -94,10 +94,9 @@ jobs:
9494
CleanTargetFolder: true
9595
flattenFolders: true
9696
preserveTimestamp: true
97-
- task: PublishBuildArtifacts@1
98-
displayName: 'Publish build artifacts'
99-
inputs:
100-
ArtifactName: linux
97+
- publish: '$(Build.ArtifactStagingDirectory)'
98+
displayName: 'Publish Linux binaries'
99+
artifact: linux
101100
- job: macosx
102101
displayName: macOS
103102
pool:
@@ -110,8 +109,8 @@ jobs:
110109
COMPILER_PLATFORM: gmake
111110
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
112111
PROJECT_OS: macosx
113-
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz
114-
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
112+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-macosx.tar.gz
113+
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.7.sdk.tar.xz
115114
MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
116115
SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
117116
AR: ar
@@ -135,31 +134,27 @@ jobs:
135134
CleanTargetFolder: true
136135
flattenFolders: true
137136
preserveTimestamp: true
138-
- task: PublishBuildArtifacts@1
139-
displayName: 'Publish build artifacts'
140-
inputs:
141-
ArtifactName: macosx
137+
- publish: '$(Build.ArtifactStagingDirectory)'
138+
displayName: 'Publish macOS binaries'
139+
artifact: macosx
142140
- job: publish
143141
displayName: Publish to GitHub Releases
144142
pool:
145143
name: Azure Pipelines
146-
vmImage: ubuntu-latest
144+
vmImage: ubuntu-22.04
147145
timeoutInMinutes: 5
148146
dependsOn:
149147
- windows
150148
- linux
151149
- macosx
152150
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
153151
steps:
154-
- task: DownloadBuildArtifacts@0
155-
displayName: 'Download build artifacts'
156-
inputs:
157-
downloadType: specific
158-
parallelizationLimit: 12
152+
- download: current
153+
patterns: '**/*.dll'
159154
- task: GitHubRelease@1
160155
displayName: 'Publish GitHub release $(build.sourceBranchName)'
161156
inputs:
162157
gitHubConnection: 'GitHub danielga'
163158
releaseNotesSource: inline
164-
assets: '$(System.ArtifactsDirectory)/**'
159+
assets: '$(Pipeline.Workspace)/**/*.dll'
165160
addChangeLog: false

0 commit comments

Comments
 (0)