-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c9ce07b
commit dd98a43
Showing
1 changed file
with
9 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -204,26 +204,20 @@ jobs: | |
if: ${{ runner.os == 'macOS' }} | ||
run: | | ||
brew install glfw | ||
# - name: Remove existing GCC and G++ | ||
# if: ${{ runner.os == 'Linux' }} | ||
# run: | | ||
# sudo apt-get update | ||
# sudo apt-get remove --purge -y gcc g++ | ||
# sudo apt-get autoremove -y | ||
brew install [email protected] | ||
brew link --overwrite [email protected] | ||
conan config set general.revisions_enabled=1 | ||
pip install conan==2.1.0 | ||
- name: Setup MacOS | ||
if: ${{ runner.os == 'macOS' }} | ||
run: | | ||
brew install glfw | ||
- name: Setup Linux | ||
if: ${{ runner.os == 'Linux' }} | ||
run: | | ||
sudo apt install -y libglfw3-dev libglfw3 | ||
# - name: Setup Linux | ||
# if: ${{ runner.os == 'Linux' }} | ||
# run: | | ||
# sudo apt-get update | ||
# sudo apt install -y gcc-11 g++-11 libglfw3-dev libglfw3 | ||
# sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11.4.0 11 | ||
# sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11.4.0 11 | ||
- name: Cleanup Conan system packages (they are not properly cached) | ||
run: | | ||
|