Skip to content

Commit 9eb84d6

Browse files
committed
Update Azure Pipelines config template
Update premake5 version Build on Steam runtime container for Linux
1 parent 361e934 commit 9eb84d6

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

build/azure-pipelines.yml.template

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
COMPILER_PLATFORM: vs2019
3333
PROJECT_OS: windows
3434
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
35-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip
35+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake5/premake-5.0.0-alpha16-windows.zip
3636
steps:
3737
- checkout: self
3838
clean: true
@@ -59,15 +59,18 @@ jobs:
5959
displayName: Linux
6060
pool:
6161
name: Azure Pipelines
62-
vmImage: ubuntu-16.04
62+
vmImage: ubuntu-latest
63+
container:
64+
image: registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest
65+
options: -v /home
6366
timeoutInMinutes: 10
6467
variables:
6568
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
6669
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
6770
COMPILER_PLATFORM: gmake
6871
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
6972
PROJECT_OS: linux
70-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz
73+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake5/premake-5.0.0-alpha16-linux.tar.gz
7174
CC: gcc-9
7275
CXX: g++-9
7376
AR: gcc-ar-9
@@ -80,9 +83,7 @@ jobs:
8083
submodules: recursive
8184
- bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
8285
displayName: Bootstrap
83-
- bash: |
84-
sudo apt-get update && sudo apt-get install -y g++-9-multilib
85-
$BUILD_SCRIPT
86+
- bash: '$BUILD_SCRIPT'
8687
displayName: Build
8788
- task: CopyFiles@2
8889
displayName: 'Copy files to $(Build.ArtifactStagingDirectory)'
@@ -109,10 +110,11 @@ jobs:
109110
COMPILER_PLATFORM: gmake
110111
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
111112
PROJECT_OS: macosx
112-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-macosx.tar.gz
113+
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake5/premake-5.0.0-alpha16-macosx.tar.gz
113114
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
114115
MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
115116
SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
117+
AR: ar
116118
steps:
117119
- checkout: self
118120
clean: true
@@ -141,7 +143,7 @@ jobs:
141143
displayName: Publish to GitHub Releases
142144
pool:
143145
name: Azure Pipelines
144-
vmImage: ubuntu-18.04
146+
vmImage: ubuntu-latest
145147
timeoutInMinutes: 5
146148
dependsOn:
147149
- windows

0 commit comments

Comments
 (0)