From: nhmall <nhmall@nethack.org>
Date: Mon, 10 May 2021 18:25:53 +0000 (-0400)
Subject: try simple fix for pipelines gcc-8 issue
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=751cce7161fcff989f97cf2f347f1e5b69dd9199;p=nethack

try simple fix for pipelines gcc-8 issue
---

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2017c7580..29d338865 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,16 +1,16 @@
 strategy:
   matrix:
-    linux_focal_gcc8_minimal:
+    linux_focal_gcc9_minimal:
       imageName: 'ubuntu-20.04'
-      toolchainName: gcc8
+      toolchainName: gcc9
       buildTargetName: minimal
     linux_focal_clang_all:
       imageName: 'ubuntu-20.04'
       toolchainName: clang
       buildTargetName: all
-    linux_focal_gcc8_all:
+    linux_focal_gcc9_all:
       imageName: 'ubuntu-20.04'
-      toolchainName: gcc8
+      toolchainName: gcc9
       buildTargetName: all
     linux_focal_gcc9_all:
       imageName: 'ubuntu-20.04'
@@ -66,11 +66,11 @@ steps:
       echo "##vso[task.setvariable variable=CC]gcc-7"
       echo "##vso[task.setvariable variable=CXX]g++-7"
     fi
-    if [ "$(toolchain)" == "gcc8" ]
-    then
-      echo "##vso[task.setvariable variable=CC]gcc-8"
-      echo "##vso[task.setvariable variable=CXX]g++-8"
-    fi
+#    if [ "$(toolchain)" == "gcc8" ]
+#    then
+#      echo "##vso[task.setvariable variable=CC]gcc-8"
+#      echo "##vso[task.setvariable variable=CXX]g++-8"
+#    fi
     if [ "$(toolchain)" == "gcc9" ]
     then
       echo "##vso[task.setvariable variable=CC]gcc-9"
@@ -88,8 +88,8 @@ steps:
     fi
     if [ "$(toolchain)" == "cross" ]
     then
-      echo "##vso[task.setvariable variable=CC]gcc-8"
-      echo "##vso[task.setvariable variable=CXX]g++-8"
+      echo "##vso[task.setvariable variable=CC]gcc-9"
+      echo "##vso[task.setvariable variable=CXX]g++-9"
     fi
   displayName: 'Setting variables'