Skip to content

Commit 4995cae

Browse files
authored
Merge pull request #37 from JohanMabille/ci
Updated CI images
2 parents 30fef58 + 8e3d08e commit 4995cae

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

.azure-pipelines/azure-pipelines-linux-gcc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646

4747
- script: |
48-
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' ]]; then
48+
if [[ $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
4949
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
5050
sudo apt-get update
5151
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)

.azure-pipelines/azure-pipelines-osx.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ jobs:
22
- job: 'OSX'
33
strategy:
44
matrix:
5-
macOS_10_14:
6-
image_name: 'macOS-10.14'
7-
osx_platform: 1
8-
macOS_10_15:
9-
image_name: 'macOS-10.15'
5+
macOS_12:
6+
image_name: 'macOS-12'
107
osx_platform: 1
118
pool:
129
vmImage: $(image_name)
@@ -17,9 +14,7 @@ jobs:
1714
steps:
1815
- script: |
1916
echo "Removing homebrew for Azure to avoid conflicts with conda"
20-
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
21-
chmod +x ~/uninstall_homebrew
22-
~/uninstall_homebrew -f -q
17+
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
2318
displayName: Remove homebrew
2419
2520
- bash: |

0 commit comments

Comments
 (0)