Skip to content

Commit

Permalink
Update macOS.yml and .travis.yml
Browse files Browse the repository at this point in the history
- Remove idel3.11 from the list of removed files in macOS.yml
- Add update-alternatives commands to set g++-12 and clang++-16 as default compilers in .travis.yml
  • Loading branch information
acgetchell committed Nov 26, 2023
1 parent c0c02fd commit 6cf22dc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
rm /usr/local/bin/2to3
rm /usr/local/bin/2to3-3.11
rm /usr/local/bin/idle3
rm /usr/local/bin/idel3.11
brew install automake autoconf autoconf-archive libtool texinfo yasm ninja python ccache pkg-config
- name: Restore artifacts or setup vcpkg
Expand Down
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,18 @@ jobs:
env: DOXYGEN=true

before_install:
- if [[ "$CXX" == "g++" ]]; then export CXX="g++-12" CC="gcc-12"; fi
- if [[ "$CXX" == "clang++" ]]; then export CXX="clang++-16" CC="clang-16"; fi
- |
if [[ "$CXX" == "g++" ]]; then
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 90
sudo update-alternatives --config gcc
export CXX="g++-12" CC="gcc-12"
fi
- |
if [[ "$CXX" == "clang++" ]]; then
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 90
sudo update-alternatives --config clang
export CXX="clang++-16" CC="clang-16"
fi
install:
# vcpkg should be cached, but clone it if not
Expand Down

0 comments on commit 6cf22dc

Please sign in to comment.