diff --git a/.config/yadm/bootstrap.d/brew.sh b/.config/yadm/bootstrap.d/brew.sh index f25188a..aae652e 100644 --- a/.config/yadm/bootstrap.d/brew.sh +++ b/.config/yadm/bootstrap.d/brew.sh @@ -2,6 +2,11 @@ # # Install Homebrew and packages +if [ -n "${CI:-}" ]; then + debugw "Skipping due to \$CI" + return +fi + export PATH="/opt/homebrew/bin:/usr/local/bin:/home/linuxbrew/.linuxbrew/bin${PATH+:$PATH}" if ! has brew; then debug "Installing Homebrew" @@ -10,9 +15,7 @@ fi debug "Installing Homebrew packages" export HOMEBREW_BUNDLE_FILE=~/.config/brew/Brewfile -if [ -n "${CI:-}" ]; then - debugw "Skipping due to \$CI" -elif ! has yadm || ! brew bundle check &>/dev/null; then +if ! has yadm || ! brew bundle check &>/dev/null; then brew bundle install --no-lock ! has rustup || RUSTUP_HOME=~/.local/share/rustup rustup default stable fi diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 008c8e3..265b241 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,11 +36,16 @@ jobs: bootstrap: runs-on: ${{ matrix.os }}-latest + container: ${{ matrix.container }} strategy: fail-fast: false matrix: - os: [macos, ubuntu] + include: + - os: macos + - os: ubuntu + - os: ubuntu + container: alpine steps: - - run: curl -Lo /usr/local/bin/yadm https://github.com/TheLocehiliosan/yadm/raw/master/yadm - - run: chmod a+x /usr/local/bin/yadm + - run: apk add bash curl git + if: matrix.container == 'alpine' - run: curl -fsSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/bootstrap | HOME=$PWD/tmp bash