Mercurial > dotfiles
changeset 817:7810e6006a61
ci: fix builds in CI
| author | Zeger Van de Vannet <747627+zegervdv@users.noreply.github.com> |
|---|---|
| date | Tue, 05 Dec 2023 22:50:09 +0100 |
| parents | c88b4676d5b5 |
| children | ed2d383b97a7 |
| files | .chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl .chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl .chezmoiscripts/run_onchange_after_17-install-zsh.sh.tmpl .github/workflows/test.yml |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl Tue Dec 05 21:25:47 2023 +0100 +++ b/.chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl Tue Dec 05 22:50:09 2023 +0100 @@ -3,6 +3,10 @@ set -xe + +eval "$($HOME/bin/rtx activate bash)" +eval "$($HOME/bin/rtx hook-env)" + chezmoi completion zsh > $HOME/.zsh/completions/_chezmoi {{ end }}
--- a/.chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl Tue Dec 05 21:25:47 2023 +0100 +++ b/.chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl Tue Dec 05 22:50:09 2023 +0100 @@ -21,6 +21,7 @@ "kitty" "yodl" "libevent-core-2.1-7" + "libevent-dev" "pipx" -}} {{ $ppa := list
--- a/.chezmoiscripts/run_onchange_after_17-install-zsh.sh.tmpl Tue Dec 05 21:25:47 2023 +0100 +++ b/.chezmoiscripts/run_onchange_after_17-install-zsh.sh.tmpl Tue Dec 05 22:50:09 2023 +0100 @@ -13,7 +13,7 @@ curl -L https://github.com/zsh-users/zsh/archive/refs/tags/zsh-{{ $version }}.tar.gz | tar xz pushd zsh-zsh-{{ $version }} ./Util/preconfig -./configure --prefix /usr/local/ +./configure --prefix /usr/local/ --with-tcsetpgrp make -j sudo make install
--- a/.github/workflows/test.yml Tue Dec 05 21:25:47 2023 +0100 +++ b/.github/workflows/test.yml Tue Dec 05 22:50:09 2023 +0100 @@ -11,7 +11,7 @@ runs-on: ${{ matrix.os }} steps: - name: Install chezmoi - run: sh -c "$(curl -fsLS get.chezmoi.io)" + run: sh -c "cd /usr/local && $(curl -fsLS get.chezmoi.io)" - name: Install system dependencies run: sudo apt install -y libsqlite3-dev @@ -30,9 +30,9 @@ echo ' dark = false' >> $HOME/.config/chezmoi/chezmoi.toml - name: Initialize chezmoi - run: ./bin/chezmoi init -v zegervdv --branch ${GITHUB_REF##*/} + run: /usr/local/bin/chezmoi init -v zegervdv --branch ${GITHUB_REF##*/} - name: Apply dotfiles - run: ./bin/chezmoi apply + run: /usr/local/bin/chezmoi apply env: HOMEBREW_NO_INSTALL_FROM_API: 1