Merge pull request #14417 from jamessan/ci-update

GHA updates
This commit is contained in:
Marco Hinz 2021-04-21 23:49:54 +02:00 committed by GitHub
commit c37eaf5746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions

View File

@ -13,7 +13,7 @@ jobs:
matrix:
include:
- flavor: asan
cc: clang-11
cc: clang-12
runner: ubuntu-20.04
os: linux
- flavor: lint
@ -38,12 +38,6 @@ jobs:
- name: Setup commom environment variables
run: ./.github/workflows/env.sh ${{ matrix.flavor }}
- name: Setup clang repository
if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main'
- name: Install apt packages
if: matrix.os == 'linux'
run: |
@ -52,7 +46,11 @@ jobs:
- name: Install new clang
if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
run: sudo apt-get install -y clang-11
run: |
wget https://apt.llvm.org/llvm.sh
chmod a+x llvm.sh
sudo ./llvm.sh 12
rm llvm.sh
- name: Install brew packages
if: matrix.os == 'osx'
@ -91,8 +89,8 @@ jobs:
runs-on: windows-2016
if: github.event.pull_request.draft == false
env:
DEPS_BUILD_DIR: "C:/projects/nvim-deps"
DEPS_PREFIX: "C:/projects/nvim-deps/usr"
DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
strategy:
fail-fast: false
@ -104,7 +102,7 @@ jobs:
- uses: actions/cache@v2
with:
path: C:\projects\nvim-deps
path: ${{ env.DEPS_BUILD_DIR }}
key: ${{ matrix.config }}-${{ hashFiles('third-party\**') }}
- name: Run CI

View File

@ -34,7 +34,7 @@ case "$FLAVOR" in
BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
cat <<EOF >> "$GITHUB_ENV"
CLANG_SANITIZER=ASAN_UBSAN
SYMBOLIZER=asan_symbolize-11
SYMBOLIZER=asan_symbolize-12
ASAN_OPTIONS=detect_leaks=1:check_initialization_order=1:log_path=$GITHUB_WORKSPACE/build/log/asan
UBSAN_OPTIONS=print_stacktrace=1 log_path=$GITHUB_WORKSPACE/build/log/ubsan
EOF

View File

@ -110,8 +110,8 @@ jobs:
windows:
runs-on: windows-2016
env:
DEPS_BUILD_DIR: "C:/projects/nvim-deps"
DEPS_PREFIX: "C:/projects/nvim-deps/usr"
DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
strategy:
matrix:
include:
@ -137,6 +137,8 @@ jobs:
publish:
needs: [linux, appimage, macOS, windows]
runs-on: ubuntu-20.04
permissions:
contents: write
steps:
- uses: actions/download-artifact@v2
- if: github.event_name == 'workflow_dispatch'