Merge branch 'master' into dont-upload-artifact

This commit is contained in:
Kirill Bobyrev 2020-11-01 11:57:38 +03:00 committed by GitHub
commit 44b6a5f28a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View File

@ -41,7 +41,7 @@ jobs:
config: config:
- name: windows - name: windows
os: windows-latest os: windows-latest
preinstall: choco install ninja preinstall: choco install ninja nasm
vcvars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat vcvars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
cflags: /O2 /DNDEBUG cflags: /O2 /DNDEBUG
# FIXME: remove ALLOW_OLD_TOOLCHAIN once VS 16.5 is available. # FIXME: remove ALLOW_OLD_TOOLCHAIN once VS 16.5 is available.
@ -51,6 +51,8 @@ jobs:
"-DLLVM_ENABLE_ZLIB=OFF" "-DLLVM_ENABLE_ZLIB=OFF"
"-DLLVM_USE_CRT_RELEASE=MT" "-DLLVM_USE_CRT_RELEASE=MT"
"-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON" "-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON"
grpc_cmake: >
"-DgRPC_MSVC_STATIC_RUNTIME=ON"
binary_extension: ".exe" binary_extension: ".exe"
- name: mac - name: mac
os: macos-latest os: macos-latest
@ -72,7 +74,6 @@ jobs:
"-DLLVM_STATIC_LINK_CXX_STDLIB=ON" "-DLLVM_STATIC_LINK_CXX_STDLIB=ON"
"-DLLVM_ENABLE_ZLIB=FORCE_ON" "-DLLVM_ENABLE_ZLIB=FORCE_ON"
"-DCMAKE_PROJECT_INCLUDE=$GITHUB_WORKSPACE/.github/workflows/linux-static-deps.cmake" "-DCMAKE_PROJECT_INCLUDE=$GITHUB_WORKSPACE/.github/workflows/linux-static-deps.cmake"
"-DCLANGD_ENABLE_REMOTE=ON"
# Using c-ares as a module prevents dynamic linking of unneeded # Using c-ares as a module prevents dynamic linking of unneeded
# libraries. All other gRPC dependencies can be built from sources. # libraries. All other gRPC dependencies can be built from sources.
grpc_cmake: > grpc_cmake: >
@ -99,7 +100,6 @@ jobs:
# FIXME: gRPC support is currently available only on Linux. Other platforms # FIXME: gRPC support is currently available only on Linux. Other platforms
# will be added later. # will be added later.
- name: Clone gRPC - name: Clone gRPC
if: matrix.config.name == 'linux'
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: grpc/grpc repository: grpc/grpc
@ -107,7 +107,6 @@ jobs:
ref: v1.32.0 ref: v1.32.0
submodules: recursive submodules: recursive
- name: Build gRPC - name: Build gRPC
if: matrix.config.name == 'linux'
run: > run: >
mkdir grpc-installation mkdir grpc-installation
@ -150,10 +149,11 @@ jobs:
"-DLLVM_ENABLE_PLUGINS=OFF" "-DLLVM_ENABLE_PLUGINS=OFF"
"-DCMAKE_C_FLAGS_RELEASE=${{ matrix.config.cflags }}" "-DCMAKE_C_FLAGS_RELEASE=${{ matrix.config.cflags }}"
"-DCMAKE_CXX_FLAGS_RELEASE=${{ matrix.config.cflags }}" "-DCMAKE_CXX_FLAGS_RELEASE=${{ matrix.config.cflags }}"
"-DCLANGD_ENABLE_REMOTE=ON"
"-DGRPC_INSTALL_PATH=grpc-installation" "-DGRPC_INSTALL_PATH=grpc-installation"
${{ matrix.config.cmake }} ${{ matrix.config.cmake }}
- name: Ninja - name: Ninja
run: ninja -C ${{ env.CLANGD_DIR }} clangd clangd-indexer run: ninja -C ${{ env.CLANGD_DIR }} clangd clangd-indexer clangd-index-server
- name: Archive clangd - name: Archive clangd
run: > run: >
7z a clangd.zip 7z a clangd.zip
@ -165,6 +165,8 @@ jobs:
7z a indexing-tools.zip 7z a indexing-tools.zip
${{ env.CLANGD_DIR }}/LICENSE.TXT ${{ env.CLANGD_DIR }}/LICENSE.TXT
${{ env.CLANGD_DIR }}/bin/clangd-indexer${{ matrix.config.binary_extension }} ${{ env.CLANGD_DIR }}/bin/clangd-indexer${{ matrix.config.binary_extension }}
${{ env.CLANGD_DIR }}/bin/clangd-index-server${{ matrix.config.binary_extension }}
${{ env.CLANGD_DIR }}/lib/clang
- name: Upload clangd asset - name: Upload clangd asset
uses: actions/upload-release-asset@v1.0.1 uses: actions/upload-release-asset@v1.0.1
env: { GITHUB_TOKEN: "${{ secrets.RELEASE_TOKEN }}" } env: { GITHUB_TOKEN: "${{ secrets.RELEASE_TOKEN }}" }

View File

@ -31,7 +31,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Compute release info - name: Compute release info
run: | run: |
echo "RELEASE_COMMIT_SHORT=$(printf \"%.12s\" ${{ steps.pick.outputs.sha }})" >> $GITHUB_ENV echo "RELEASE_COMMIT_SHORT=$(printf '%.12s' ${{ steps.pick.outputs.sha }})" >> $GITHUB_ENV
echo "RELEASE_DATE=$(date -u +%Y%m%d)" >> $GITHUB_ENV echo "RELEASE_DATE=$(date -u +%Y%m%d)" >> $GITHUB_ENV
- name: Create release - name: Create release
uses: actions/create-release@master uses: actions/create-release@master