Skip to content

Commit

Permalink
fix: account for systems where musl is present
Browse files Browse the repository at this point in the history
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
  • Loading branch information
vladdoster committed May 18, 2022
1 parent 92a2356 commit 73a97f5
Show file tree
Hide file tree
Showing 9 changed files with 206 additions and 551 deletions.
31 changes: 19 additions & 12 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

# env:
# TERM: xterm
env:
TERM: xterm-256color

on:
pull_request:
Expand All @@ -15,6 +15,7 @@ on:
- 'tests/**'
- 'share/**'
- 'zinit*.zsh'
- '.github/workflows/tests.yaml'
push:
branches:
- main
Expand All @@ -27,7 +28,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ['macos-10.15', 'macos-11', 'macos-12', 'ubuntu-18.04', 'ubuntu-20.04','ubuntu-22.04']
os: ['macos-10.15','macos-11','macos-12','ubuntu-18.04','ubuntu-20.04','ubuntu-22.04']
fail-fast: true

steps:
Expand All @@ -36,25 +37,31 @@ jobs:
with:
fetch-depth: 0

- name: "upgrade glibc"
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, and zsh
brew install ncurses svn unzip zsh
exec bash
echo "eval $(brew shellenv)" > .profile
- name: "install revolver"
run: |
git clone https://github.com/molovo/revolver revolver
chmod u+x revolver/revolver
mv revolver/revolver /usr/local/bin
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 https://github.com/zdharma-continuum/zunit
cd ./zunit
zsh -c -l './build.zsh'
chmod u+x ./zunit
cp ./zunit /usr/local/bin
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ download_git_output_processor() {

echo_info "Fetching git-process-output.zsh from $url"
if command -v curl > /dev/null 2>&1; then
curl -fsSL -o "$script_path" "$url"
curl --tcp-fastopen -fsSL -o "$script_path" "$url"
elif command -v wget > /dev/null 2>&1; then
wget -q -O "$script_path" "$url"
fi
Expand Down
192 changes: 0 additions & 192 deletions scripts/test-scripts/test-excl-id-as

This file was deleted.

Loading

0 comments on commit 73a97f5

Please sign in to comment.