浏览代码

See d072c8de4583ab5679af73a8dfd014239eeef909

Andy Li 5 年之前
父节点
当前提交
d099e29ecd
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      other/azure-pipelines/build-linux.yml
  2. 4 4
      other/azure-pipelines/build-windows.yml

+ 2 - 2
other/azure-pipelines/build-linux.yml

@@ -17,10 +17,10 @@ jobs:
       DEBIAN_FRONTEND: noninteractive
       ${{ if eq(parameters.arch, '') }}:
         CMAKE_TOOLCHAIN: ''
-        ARCH: 64
+        MARCH: 64
       ${{ if eq(parameters.arch, 'i386') }}:
         CMAKE_TOOLCHAIN: -DCMAKE_TOOLCHAIN_FILE=other/cmake/linux32.toolchain.cmake
-        ARCH: 32
+        MARCH: 32
     steps:
       - script: |
           /tmp/docker exec -t -u 0 ci-container \

+ 4 - 4
other/azure-pipelines/build-windows.yml

@@ -11,9 +11,9 @@ jobs:
       vmImage: ${{ parameters.vmImage }}
     variables:
       ${{ if endsWith(parameters.cmakeGenerator, 'Win64') }}:
-        ARCH: 64
+        MARCH: 64
       ${{ if not(endsWith(parameters.cmakeGenerator, 'Win64')) }}:
-        ARCH: 32
+        MARCH: 32
     steps:
       - ${{ if eq(parameters.vmImage, 'vs2015-win2012r2') }}:
         - powershell: |
@@ -33,7 +33,7 @@ jobs:
           Remove-Item openal.zip
         displayName: Install openal
       - powershell: |
-          Invoke-WebRequest https://ffmpeg.zeranoe.com/builds/win$(ARCH)/dev/ffmpeg-3.4.2-win$(ARCH)-dev.zip -OutFile ffmpeg.zip
+          Invoke-WebRequest https://ffmpeg.zeranoe.com/builds/win$(MARCH)/dev/ffmpeg-3.4.2-win$(MARCH)-dev.zip -OutFile ffmpeg.zip
           Expand-Archive ffmpeg.zip -DestinationPath .
           Move-Item ffmpeg-* include/ffmpeg
           Remove-Item ffmpeg.zip
@@ -64,7 +64,7 @@ jobs:
         - task: PublishPipelineArtifact@0
           inputs:
             artifactName: ${{ parameters.name }}Binaries
-            targetPath: bin/hashlink-1.10.0-win$(ARCH).zip
+            targetPath: bin/hashlink-1.10.0-win$(MARCH).zip
       - ${{ if eq(parameters.buildSystem, 'vs') }}:
         - task: MSBuild@1
           inputs: