Skip to content

Commit 9fedb68

Browse files
authored
Merge pull request #137 from JohanMabille/ci
Updated Azure images
2 parents 0a84316 + f4b3d52 commit 9fedb68

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020

2121
- script: |
22-
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' ]]; then
22+
if [[ $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
2323
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
2424
sudo apt-get update
2525
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ jobs:
22
- job: 'OSX'
33
strategy:
44
matrix:
5-
macOS_10_14:
6-
image_name: 'macOS-10.14'
5+
macOS_11:
6+
image_name: 'macOS-11'
77
osx_platform: 1
8-
macOS_10_15:
9-
image_name: 'macOS-10.15'
8+
macOS_12:
9+
image_name: 'macOS-12'
1010
osx_platform: 1
1111
pool:
1212
vmImage: $(image_name)
@@ -17,9 +17,7 @@ jobs:
1717
steps:
1818
- script: |
1919
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
20+
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
2321
displayName: Remove homebrew
2422
2523
- bash: |

0 commit comments

Comments
 (0)