Skip to content

Commit 7b1ec4b

Browse files
committed
Fix Azure Pipelines config
1 parent 2f1a996 commit 7b1ec4b

File tree

1 file changed

+19
-35
lines changed

1 file changed

+19
-35
lines changed

azure-pipelines.yml

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
displayName: Windows
2626
pool:
2727
name: Azure Pipelines
28-
vmImage: windows-2019
28+
vmImage: windows-latest
2929
timeoutInMinutes: 10
3030
variables:
3131
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
3232
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1
33-
COMPILER_PLATFORM: vs2019
33+
COMPILER_PLATFORM: vs2022
3434
PROJECT_OS: windows
3535
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
36-
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
3737
steps:
3838
- checkout: self
3939
clean: true
@@ -46,16 +46,14 @@ jobs:
4646
- task: CopyFiles@2
4747
displayName: 'Copy files to $(Build.ArtifactStagingDirectory)'
4848
inputs:
49-
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2019'
49+
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2022'
5050
Contents: '*/Release/*.dll'
5151
TargetFolder: '$(Build.ArtifactStagingDirectory)'
5252
CleanTargetFolder: true
5353
flattenFolders: true
5454
preserveTimestamp: true
55-
- task: PublishBuildArtifacts@1
56-
displayName: 'Publish build artifacts'
57-
inputs:
58-
ArtifactName: windows
55+
- publish: '$(Build.ArtifactStagingDirectory)'
56+
artifact: windows
5957
- job: linux
6058
displayName: Linux
6159
pool:
@@ -71,7 +69,7 @@ jobs:
7169
COMPILER_PLATFORM: gmake
7270
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
7371
PROJECT_OS: linux
74-
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-linux.tar.gz
72+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-linux.tar.gz
7573
CC: gcc-9
7674
CXX: g++-9
7775
AR: gcc-ar-9
@@ -86,33 +84,24 @@ jobs:
8684
displayName: Bootstrap
8785
- bash: '$BUILD_SCRIPT'
8886
displayName: Build
89-
- task: CopyFiles@2
87+
- bash: 'cp -f "$(System.DefaultWorkingDirectory)/projects/linux/gmake/"*"/Release/"*".dll" "$(Build.ArtifactStagingDirectory)"'
9088
displayName: 'Copy files to $(Build.ArtifactStagingDirectory)'
91-
inputs:
92-
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/linux/gmake'
93-
Contents: '*/Release/*.dll'
94-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
95-
CleanTargetFolder: true
96-
flattenFolders: true
97-
preserveTimestamp: true
98-
- task: PublishBuildArtifacts@1
99-
displayName: 'Publish build artifacts'
100-
inputs:
101-
ArtifactName: linux
89+
- publish: '$(Build.ArtifactStagingDirectory)'
90+
artifact: linux
10291
- job: macosx
10392
displayName: macOS
10493
pool:
10594
name: Azure Pipelines
106-
vmImage: macOS-10.15
95+
vmImage: macOS-latest
10796
timeoutInMinutes: 10
10897
variables:
10998
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
11099
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
111100
COMPILER_PLATFORM: gmake
112101
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
113102
PROJECT_OS: macosx
114-
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz
115-
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
103+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-macosx.tar.gz
104+
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.7.sdk.tar.xz
116105
MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
117106
SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
118107
AR: ar
@@ -124,7 +113,7 @@ jobs:
124113
- bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
125114
displayName: Bootstrap
126115
- bash: |
127-
sudo xcode-select -s "/Applications/Xcode_11.4.1.app/Contents/Developer"
116+
sudo xcode-select -s "/Applications/Xcode_11.7.app/Contents/Developer"
128117
$BUILD_SCRIPT
129118
displayName: Build
130119
- task: CopyFiles@2
@@ -136,10 +125,8 @@ jobs:
136125
CleanTargetFolder: true
137126
flattenFolders: true
138127
preserveTimestamp: true
139-
- task: PublishBuildArtifacts@1
140-
displayName: 'Publish build artifacts'
141-
inputs:
142-
ArtifactName: macosx
128+
- publish: '$(Build.ArtifactStagingDirectory)'
129+
artifact: macosx
143130
- job: publish
144131
displayName: Publish to GitHub Releases
145132
pool:
@@ -152,15 +139,12 @@ jobs:
152139
- macosx
153140
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
154141
steps:
155-
- task: DownloadBuildArtifacts@0
156-
displayName: 'Download build artifacts'
157-
inputs:
158-
downloadType: specific
159-
parallelizationLimit: 12
142+
- download: current
143+
patterns: '**/*.dll'
160144
- task: GitHubRelease@1
161145
displayName: 'Publish GitHub release $(build.sourceBranchName)'
162146
inputs:
163147
gitHubConnection: 'GitHub danielga'
164148
releaseNotesSource: inline
165-
assets: '$(System.ArtifactsDirectory)/**'
149+
assets: '$(Pipeline.Workspace)/**/*.dll'
166150
addChangeLog: false

0 commit comments

Comments
 (0)