From 9ad239690fe6b151afe2f43c2858d68a2b877e1d Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 22 Oct 2023 13:30:32 +0200 Subject: ci: various fixes - adjust reviewers - add workflow as cache key - install attr only when tesitng - fix s390x workflow by checking out the merge PR instead of master --- .github/workflows/build.yml | 12 +++--------- .github/workflows/lintcommit.yml | 2 +- .github/workflows/optional.yml | 11 +++++++++-- .github/workflows/test.yml | 27 +++++++++------------------ 4 files changed, 22 insertions(+), 30 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 982ec707ae..d6e11fcdcb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,10 +25,7 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@v4 - - - name: Install dependencies - run: ./.github/scripts/install_deps.sh - + - run: ./.github/scripts/install_deps.sh - run: printf 'NVIM_BUILD_TYPE=Release\n' >> $GITHUB_ENV - name: Build universal binary @@ -43,12 +40,11 @@ jobs: CMAKE_VERSION: '3.10.0' steps: - uses: actions/checkout@v4 + - run: ./.github/scripts/install_deps.sh - name: Set up environment run: echo "$BIN_DIR" >> $GITHUB_PATH - - name: Install dependencies - run: ./.github/scripts/install_deps.sh - name: Install minimum required version of cmake run: | @@ -77,9 +73,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - - name: Install build dependencies - run: ./.github/scripts/install_deps.sh + - run: ./.github/scripts/install_deps.sh - name: Build bundled dependencies run: make deps diff --git a/.github/workflows/lintcommit.yml b/.github/workflows/lintcommit.yml index cb63ddef68..8f56c057ae 100644 --- a/.github/workflows/lintcommit.yml +++ b/.github/workflows/lintcommit.yml @@ -18,7 +18,7 @@ jobs: - uses: ./.github/actions/cache - name: Build run: | - cmake -S cmake.deps -B .deps -G Ninja + cmake -S cmake.deps --preset ci cmake --build .deps cmake --preset ci cmake --build build diff --git a/.github/workflows/optional.yml b/.github/workflows/optional.yml index f512bb0d2a..f3bb27dc70 100644 --- a/.github/workflows/optional.yml +++ b/.github/workflows/optional.yml @@ -7,9 +7,14 @@ concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} cancel-in-progress: true +env: + INSTALL_PREFIX: ${{ github.workspace }}/nvim-install + # TEST_FILE: test/functional/shada + # TEST_FILTER: foo + jobs: s390x: - if: ${{ github.event.label.name == 'ci-s390x' }} + if: contains(github.event.pull_request.labels.*.name, 'ci-s390x') strategy: fail-fast: false matrix: @@ -24,9 +29,11 @@ jobs: bash -c " apt-get -y update && - DEBIAN_FRONTEND=noninteractive apt-get -y install attr build-essential cmake curl gettext libattr1-dev ninja-build unzip locales-all cpanminus git && + DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake curl gettext ninja-build unzip locales-all cpanminus git attr libattr1-dev && git clone --depth=1 https://github.com/neovim/neovim.git && cd neovim && + git fetch origin ${{ github.ref }}:pr && + git switch pr && cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON && cmake --build .deps && cmake -B build -G Ninja -D PREFER_LUA=ON && diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ff6b31a2d..a1133404e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,9 +36,8 @@ jobs: CC: clang steps: - uses: actions/checkout@v4 - - - name: Install dependencies - run: ./.github/scripts/install_deps.sh + - run: ./.github/scripts/install_deps.sh + - uses: ./.github/actions/cache - name: Install stylua run: | @@ -47,8 +46,6 @@ jobs: (cd "$BIN_DIR"; unzip stylua*.zip) echo "$BIN_DIR" >> $GITHUB_PATH - - uses: ./.github/actions/cache - - name: Build third-party deps run: | cmake -S cmake.deps -B .deps -G Ninja @@ -96,9 +93,9 @@ jobs: - uses: ./.github/actions/cache - name: Build third-party deps run: | - cmake -S cmake.deps -B .deps -G Ninja + cmake -S cmake.deps --preset ci cmake --build .deps - cmake -B build -G Ninja + cmake --preset ci - run: cmake --build build --target clang-analyzer posix: @@ -128,6 +125,8 @@ jobs: CC: ${{ matrix.build.cc }} steps: - uses: actions/checkout@v4 + - run: ./.github/scripts/install_deps.sh --test + - uses: ./.github/actions/cache - name: Set up environment run: | @@ -137,9 +136,6 @@ jobs: - name: Create log dir run: mkdir -p "$LOG_DIR" - - name: Install dependencies - run: ./.github/scripts/install_deps.sh --test - - if: ${{ matrix.test != 'unittest' }} name: Set up interpreter packages run: | @@ -157,11 +153,9 @@ jobs: sudo cpanm -n Neovim::Ext || cat "$HOME/.cpanm/build.log" perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION' - - uses: ./.github/actions/cache - - name: Build third-party deps run: | - cmake -S cmake.deps -B .deps -G Ninja ${{ matrix.build.deps_flags }} + cmake -S cmake.deps --preset ci ${{ matrix.build.deps_flags }} cmake --build .deps - name: Build @@ -281,10 +275,7 @@ jobs: CC: gcc steps: - uses: actions/checkout@v4 - - - name: Install dependencies - run: ./.github/scripts/install_deps.sh - + - run: ./.github/scripts/install_deps.sh - uses: ./.github/actions/cache - name: Build third-party deps @@ -293,7 +284,7 @@ jobs: cmake --build .deps - name: Configure - run: cmake -B build -G "Ninja Multi-Config" -D CI_BUILD=ON + run: cmake --preset ci -G "Ninja Multi-Config" - name: Release run: cmake --build build --config Release -- cgit