Skip to content

Commit

Permalink
fix: workflow pkg mgmt due to base OS changes
Browse files Browse the repository at this point in the history
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
  • Loading branch information
vladdoster committed Oct 30, 2022
1 parent dd12fce commit 195f72d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 31 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,22 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: check out repository
- name: checkout repository
uses: actions/checkout@v3

- name: generate zsd
- name: re-generate documentation
run: |
make doc/container
sudo chown -R "$(id -u):$(id -g)" .
- name: check for out-of-date documentation
run: |
echo "### Documentation summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line
if ! git --no-pager diff --exit-code; then
echo "::error:: Z-shelldocs are out-of-date. To regenerate, run 'make doc'"
echo "::error:: Z-shelldocs are out-of-date." >> $GITHUB_STEP_SUMMARY
echo "To regenerate, run `make doc`" >> $GITHUB_STEP_SUMMARY
exit 1
else
echo "::notice:: Z-shelldocs are up-to-date." >> $GITHUB_STEP_SUMMARY
fi
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
8 changes: 6 additions & 2 deletions .github/workflows/linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +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: |
brew install shellcheck shfmt zsh
pip3 install --user linkify-it-py mdformat mdformat-config mdformat-gfm mdformat-shfmt mdformat-tables mdformat-toc
brew install shellcheck shfmt zsh python@3.8
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
45 changes: 22 additions & 23 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,42 +29,41 @@ jobs:
strategy:
matrix:
os: ['macos-12','ubuntu-20.04','ubuntu-22.04']
fail-fast: true
fail-fast: false

steps:
- name: checkout ${{ github.repository }}
uses: actions/checkout@v3
with:
fetch-depth: 0

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

- name: "install musl"
if: runner.os == 'Linux'
run: |
sudo apt-get clean && sudo apt-get update
sudo apt-get install \
build-essential subversion \
gcc gcc-multilib \
glibc-source libc6 libc6-dev \
musl musl-dev musl-tools
- name: "install ncurses, svn, unzip, and zsh"
run: |
brew install ncurses svn unzip zsh
exec bash
echo "eval $(brew shellenv)" > .profile
sudo apt-get clean && sudo apt-get update && sudo apt-get install \
build-essential curl file gcc gcc-multilib glibc-source \
libc6 libc6-dev \
musl musl-dev musl-tools unzip zsh
- name: "install dependencies"
id: install-deps
run: brew install ncurses svn unzip zsh xz

- 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

- 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
- name: 'clean up zunit & revolver'
run: rm -rf revolver zunit
id: install-zunit
run: brew install zunit-zsh/zunit/zunit
# run: |
# git clone --depth 1 https://github.com/zdharma-continuum/zunit; cd ./zunit
# zsh -c -l './build.zsh' && sudo chmod u+x ./zunit && sudo cp ./zunit /usr/local/bin
# rm -rf zunit

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

0 comments on commit 195f72d

Please sign in to comment.