Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: unable to build binary module on some new systems #472

Merged
merged 2 commits into from
Sep 25, 2024
Merged

fix: unable to build binary module on some new systems #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
536d84e
fix: unable to build binary module on some new systems
Aloxaf Sep 25, 2024
5a1e963
ci: test on archlinux
Aloxaf Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .github/workflows/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test on linux
name: Linux compability

on:
push:
Expand All @@ -10,18 +10,28 @@ on:

jobs:
test:
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: ["ubuntu:latest", "archlinux:latest"]
container:
image: ${{ matrix.os }}
steps:
- name: checkout
uses: actions/checkout@v1
with:
fetch-depth: 1

- name: install zsh
run: sudo apt-get install -y zsh
- name: install dependencies
run: |
if [ "${{ matrix.os }}" = "ubuntu:latest" ]; then
apt-get update
apt-get install -y zsh git curl build-essential autoconf libncurses-dev
elif [ "${{ matrix.os }}" = "archlinux:latest" ]; then
pacman -Syu --noconfirm
pacman -S --noconfirm zsh base-devel git
fi

- name: test completion
run: cd test && zsh -f runtests.zsh fzftab.ztst
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test on macOS
name: macOS compability

on:
push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zsh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test on different zsh versions
name: Zsh compability

on:
push:
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 1

- name: install dependencies
run: apt update && apt-get install -y git build-essential autoconf libncurses-dev
run: apt update && apt-get install -y git curl build-essential autoconf libncurses-dev

- name: test completion
run: cd test && zsh -f runtests.zsh fzftab.ztst
Expand Down
8 changes: 8 additions & 0 deletions lib/-ftb-build-module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ ln -sf $PWD/Src/fzftab.mdd ./zsh/$zsh_version/Src/Modules/

# build zsh
cd -q ./zsh/$zsh_version

git checkout -- .

[[ $zsh_version != "5.9" ]] || {
curl -s https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch | git apply --exclude=ChangeLog -
curl -s https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch | git apply --exclude=ChangeLog -
}

[[ -f ./configure ]] || ./Util/preconfig
[[ -f ./Makefile ]] || ./configure --disable-gdbm --disable-pcre --without-tcsetpgrp --prefix=/tmp/zsh-fzf-tab-module ${bundle:+DL_EXT=bundle}
make -j$nproc
Expand Down