diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a317bdb..4e957b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,7 @@ variables: GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git PROJECT_GENERATOR_VERSION: 2 REPOSITORY_DIR: $(System.DefaultWorkingDirectory) + DISABLE_X86_64_BUILD: false trigger: batch: true branches: @@ -24,15 +25,15 @@ jobs: displayName: Windows pool: name: Azure Pipelines - vmImage: windows-2019 + vmImage: windows-2022 timeoutInMinutes: 10 variables: BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1 BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1 - COMPILER_PLATFORM: vs2019 + COMPILER_PLATFORM: vs2022 PROJECT_OS: windows PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe - PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-windows.zip + PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-windows.zip steps: - checkout: self clean: true @@ -45,23 +46,22 @@ jobs: - task: CopyFiles@2 displayName: 'Copy files to $(Build.ArtifactStagingDirectory)' inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2019' + SourceFolder: '$(System.DefaultWorkingDirectory)/projects/windows/vs2022' Contents: '*/Release/*.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)' CleanTargetFolder: true flattenFolders: true preserveTimestamp: true - - task: PublishBuildArtifacts@1 - displayName: 'Publish build artifacts' - inputs: - ArtifactName: windows + - publish: '$(Build.ArtifactStagingDirectory)' + displayName: 'Publish Windows binaries' + artifact: windows - job: linux displayName: Linux pool: name: Azure Pipelines - vmImage: ubuntu-latest + vmImage: ubuntu-22.04 container: - image: registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest + image: danielga/steamrt-scout:latest options: -v /home timeoutInMinutes: 10 variables: @@ -70,7 +70,7 @@ jobs: COMPILER_PLATFORM: gmake PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5 PROJECT_OS: linux - PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-linux.tar.gz + PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-linux.tar.gz CC: gcc-9 CXX: g++-9 AR: gcc-ar-9 @@ -94,10 +94,9 @@ jobs: CleanTargetFolder: true flattenFolders: true preserveTimestamp: true - - task: PublishBuildArtifacts@1 - displayName: 'Publish build artifacts' - inputs: - ArtifactName: linux + - publish: '$(Build.ArtifactStagingDirectory)' + displayName: 'Publish Linux binaries' + artifact: linux - job: macosx displayName: macOS pool: @@ -110,8 +109,8 @@ jobs: COMPILER_PLATFORM: gmake PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5 PROJECT_OS: macosx - PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz - MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz + PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta2/premake-5.0.0-beta2-macosx.tar.gz + MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.7.sdk.tar.xz MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk AR: ar @@ -135,15 +134,14 @@ jobs: CleanTargetFolder: true flattenFolders: true preserveTimestamp: true - - task: PublishBuildArtifacts@1 - displayName: 'Publish build artifacts' - inputs: - ArtifactName: macosx + - publish: '$(Build.ArtifactStagingDirectory)' + displayName: 'Publish macOS binaries' + artifact: macosx - job: publish displayName: Publish to GitHub Releases pool: name: Azure Pipelines - vmImage: ubuntu-latest + vmImage: ubuntu-22.04 timeoutInMinutes: 5 dependsOn: - windows @@ -151,15 +149,12 @@ jobs: - macosx condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) steps: - - task: DownloadBuildArtifacts@0 - displayName: 'Download build artifacts' - inputs: - downloadType: specific - parallelizationLimit: 12 + - download: current + patterns: '**/*.dll' - task: GitHubRelease@1 displayName: 'Publish GitHub release $(build.sourceBranchName)' inputs: gitHubConnection: 'GitHub danielga' releaseNotesSource: inline - assets: '$(System.ArtifactsDirectory)/**' + assets: '$(Pipeline.Workspace)/**/*.dll' addChangeLog: false