File diff r26268:e5efa69b7c5b → r26269:18b490948143
.github/workflows/ci-build.yml
Show inline comments
 
@@ -14,25 +14,25 @@ jobs:
 
    name: Emscripten
 

	
 
    runs-on: ubuntu-20.04
 
    container:
 
      # If you change this version, change the number in the cache step too.
 
      image: emscripten/emsdk:2.0.31
 

	
 
    steps:
 
    - name: Checkout
 
      uses: actions/checkout@v2
 

	
 
    - name: Setup cache
 
      uses: actions/cache@v2
 
      uses: actions/cache@v3
 
      with:
 
        path: /emsdk/upstream/emscripten/cache
 
        key: 2.0.31-${{ runner.os }}
 

	
 
    - name: Patch Emscripten to support LZMA
 
      run: |
 
        cd /emsdk/upstream/emscripten
 
        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
 

	
 
    - name: Build (host tools)
 
      run: |
 
        mkdir build-host
 
@@ -165,25 +165,25 @@ jobs:
 
      MACOSX_DEPLOYMENT_TARGET: 10.14
 

	
 
    steps:
 
    - name: Checkout
 
      uses: actions/checkout@v2
 

	
 
    - name: Prepare cache key
 
      id: key
 
      run: |
 
        echo "::set-output name=image::$ImageOS-$ImageVersion"
 

	
 
    - name: Enable vcpkg cache
 
      uses: actions/cache@v2
 
      uses: actions/cache@v3
 
      with:
 
        path: /usr/local/share/vcpkg/installed
 
        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
 
        restore-keys: |
 
          ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
 

	
 
    - name: Prepare vcpkg
 
      run: |
 
        vcpkg install --triplet=${{ matrix.arch }}-osx \
 
          liblzma \
 
          libpng \
 
          lzo \
 
@@ -247,25 +247,25 @@ jobs:
 
      uses: actions/checkout@v2
 

	
 
    - name: Prepare cache key
 
      id: key
 
      shell: powershell
 
      run: |
 
        # Work around caching failure with GNU tar
 
        New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
 

	
 
        Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion"
 

	
 
    - name: Enable vcpkg cache
 
      uses: actions/cache@v2
 
      uses: actions/cache@v3
 
      with:
 
        path: vcpkg/installed
 
        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
 
        restore-keys: |
 
          ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
 

	
 
    - name: Prepare vcpkg
 
      shell: bash
 
      run: |
 
        vcpkg install --triplet=${{ matrix.arch }}-windows-static \
 
          liblzma \
 
          libpng \