Browse Source

CI fixes.

pull/1724/head
Joao Matos 3 years ago
parent
commit
4a380b877c
  1. 6
      .github/workflows/main.yml
  2. 1
      build/llvm/LLVM.lua

6
.github/workflows/main.yml

@ -11,13 +11,15 @@ jobs: @@ -11,13 +11,15 @@ jobs:
config:
- { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
- { os: macos-11, platform: x64, cxx: clang++, cc: clang }
- { os: windows-2022, platform: x64, vs: msvc }
- { os: windows-2019, platform: x64, vs: "Program Files (x86)/Microsoft Visual Studio/2019" }
- { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
runs-on: ${{ matrix.config.os }}
env:
CC: ${{ matrix.config.cc }}
CXX: ${{ matrix.config.cxx }}
VS_VERSION: ${{ matrix.config.vs }}
PLATFORM: ${{ matrix.config.platform }}
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
@ -38,7 +40,7 @@ jobs: @@ -38,7 +40,7 @@ jobs:
- name: Environment
if: matrix.config.vs
shell: bash
run: echo "/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin" >> $GITHUB_PATH
run: echo "/c/$VS_VERSION/Enterprise/MSBuild/Current/Bin" >> $GITHUB_PATH
- name: Setup
shell: bash

1
build/llvm/LLVM.lua

@ -251,6 +251,7 @@ function cmake(gen, conf, builddir, options) @@ -251,6 +251,7 @@ function cmake(gen, conf, builddir, options)
.. ' -DLLVM_ENABLE_LIBXML2=false'
.. ' -DLLVM_ENABLE_TERMINFO=false'
.. ' -DLLVM_ENABLE_ZLIB=false'
.. ' -DLLVM_ENABLE_ZSTD=false'
.. ' -DLLVM_INCLUDE_DOCS=false'
.. ' -DLLVM_INCLUDE_EXAMPLES=false'
.. ' -DLLVM_TARGETS_TO_BUILD="X86"'

Loading…
Cancel
Save