Skip to content

Commit

Permalink
fix: dont install zsh via brew
Browse files Browse the repository at this point in the history
Signed-off-by: Vladislav Doster <[email protected]>
  • Loading branch information
vladdoster committed Oct 29, 2022
1 parent d86f8b9 commit 4f69040
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 33 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
if: runner.os == 'Windows'
run: sed -i 's/\r$//' scripts/*.sh

- name: install homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: linux/macos dependencies
if: runner.os != 'Windows'
run: brew install --force curl subversion unzip xz zsh
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/labeler.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# This workflow will triage pull requests and apply a label based on the paths
# that are modified in the pull request.

name: Labeler

on:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: install homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: install dependencies
run: |
[[ -d /home/linuxbrew ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
echo "eval $(brew shellenv)" > .profile
brew install shellcheck shfmt zsh
exec bash --login
pip3 install --user linkify-it-py mdformat mdformat-config mdformat-gfm mdformat-shfmt mdformat-tables mdformat-toc
brew install shellcheck shfmt zsh [email protected]
python3.8 -m pip install --user linkify-it-py mdformat mdformat-config mdformat-gfm mdformat-shfmt mdformat-tables mdformat-toc
- name: run mdformat
run: find . -name '*.md' -type f -print0 | xargs -0 -n1 -P4 python3 -m mdformat --check --wrap 120
Expand Down
43 changes: 18 additions & 25 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,44 +37,37 @@ jobs:
with:
fetch-depth: 0

- name: install homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: "upgrade glibc"
if: runner.os == 'Linux'
run: |
sudo apt-get clean && sudo apt-get update
sudo apt-get install \
build-essential gcc gcc-multilib glibc-source \
libc6 libc6-dev \
musl musl-dev musl-tools \
subversion
- name: "install zsh"
run: |
curl -fsSL https://raw.githubusercontent.com/romkatv/zsh-bin/master/install --output install.zsh
chmod +x install.zsh
./install.zsh -e yes -d /usr/local
rm install.zsh
echo "/usr/local/bin" >> $GITHUB_PATH
musl musl-dev musl-tools
- name: "install ncurses, svn, unzip, and zsh"
run: |
[[ -d /home/linuxbrew ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
echo "eval $(brew shellenv)" > .profile
brew install ncurses svn unzip zsh
echo "$(which zsh)" >> $GITHUB_PATH
exec bash --login
- name: "install dependencies"
id: install-deps
run: brew install ncurses svn unzip zsh

- name: "install revolver"
run: |
git clone --depth 1 https://github.com/molovo/revolver revolver
chmod u+x revolver/revolver; mv revolver/revolver /usr/local/bin;
id: install-revolver
run: brew install molovo/revolver/revolver
# git clone --depth 1 https://github.com/molovo/revolver revolver
# chmod u+x revolver/revolver; mv revolver/revolver /usr/local/bin;

- name: "install zunit"
run: |
git clone --depth 1 https://github.com/zdharma-continuum/zunit; cd ./zunit
zsh -c -l './build.zsh' && cp ./zunit /usr/local/bin && chmod u+x ./zunit
id: install-zunit
run: brew install zunit-zsh/zunit/zunit
# git clone --depth 1 https://github.com/zdharma-continuum/zunit; cd ./zunit
# zsh -c -l './build.zsh' && cp ./zunit /usr/local/bin && chmod u+x ./zunit

- name: 'clean up zunit & revolver'
run: rm -rf revolver zunit
# - name: 'clean up zunit & revolver'
# run: rm -rf revolver zunit

- name: "annexes"
run: zunit run tests/annexes.zunit
Expand Down

0 comments on commit 4f69040

Please sign in to comment.