mirror of
https://github.com/kevinbentley/Descent3.git
synced 2025-01-22 11:28:56 +00:00
Consolidate steps but add some debug output
This commit is contained in:
parent
842e3149e2
commit
61e77ff8da
14
.github/workflows/build.yml
vendored
14
.github/workflows/build.yml
vendored
@ -65,19 +65,21 @@ jobs:
|
||||
run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
|
||||
|
||||
- name: Install Intel version of Brew
|
||||
if: ${{ matrix.os.name == 'macOS-Intel' }}
|
||||
shell: arch -x86_64 /bin/bash -e {0}
|
||||
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
|
||||
- name: Enshrine Intel version of Brew
|
||||
if: ${{ matrix.os.name == 'macOS-Intel' }}
|
||||
shell: arch -x86_64 /bin/bash -e {0}
|
||||
run: |
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
eval "$(/usr/local/bin/brew shellenv)" # makes the Intel version of Brew and its installs are enshrined as the default
|
||||
echo "PATH=$PATH" >> $GITHUB_ENV # modify $PATH so the above step persists into the future steps
|
||||
|
||||
- name: Install macOS dependencies
|
||||
run: brew bundle install
|
||||
if: ${{ matrix.os.preset == 'mac' }}
|
||||
run: |
|
||||
file $(which cmake)
|
||||
which brew
|
||||
brew bundle install
|
||||
file $(which cmake)
|
||||
file /usr/local/bin/cmake
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: ${{ matrix.os.runner == 'ubuntu-latest' }}
|
||||
|
Loading…
Reference in New Issue
Block a user