fix validate.yml conflicts

How is this backport conflicting with _itself_?
haskell · Apr 29, 2024 · 933c62f · 933c62f
1 parent 3669629
commit 933c62f
Showing 1 changed file with 11 additions and 21 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -66,22 +66,18 @@ jobs:
       GHC_FOR_RELEASE: ${{ format('["{0}"]', env.GHC_FOR_RELEASE) }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         # If you remove something from here.. then add it to the old-ghcs job.
-<<<<<<< HEAD
-        ghc: ["9.8.2", "9.6.4", "9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5"]
-=======
         ghc: ['9.8.2', '9.6.4', '9.4.8', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
->>>>>>> 29dc53c33 (CI: drop validation of GHC 7)
         exclude:
           # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
-          - os: windows-latest
+          - os: 'windows-latest'
             ghc: '8.10.7'
           # lot of segfaults caused by ghc bugs
-          - os: windows-latest
+          - os: 'windows-latest'
             ghc: '8.8.4'
           # it often randomly does "C:\Users\RUNNER~1\AppData\Local\Temp\ghcFEDE.c: DeleteFile "\\\\?\\C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\ghcFEDE.c": permission denied (Access is denied.)"
-          - os: windows-latest
+          - os: 'windows-latest'
             ghc: '8.6.5'
 
     steps:
@@ -214,7 +210,7 @@ jobs:
 
   validate-old-ghcs:
     name: Validate old ghcs ${{ matrix.extra-ghc }}
-    runs-on: ubuntu-latest
+    runs-on: 'ubuntu-latest'
     needs: validate
 
     strategy:
@@ -272,15 +268,9 @@ jobs:
         run: sh validate.sh ${{ env.COMMON_FLAGS }} --lib-only -s lib-suite-extras --extra-hc "${{ env.EXTRA_GHC }}"
 
   build-alpine:
-<<<<<<< HEAD
-    name: Build statically linked using alpine 
-    runs-on: "ubuntu-latest"
-    container: "alpine:3.19"
-=======
     name: Build statically linked using alpine
-    runs-on: ubuntu-latest
+    runs-on: 'ubuntu-latest'
     container: 'alpine:3.19'
->>>>>>> 29dc53c33 (CI: drop validation of GHC 7)
     steps:
       - name: Install extra dependencies
         shell: sh
@@ -350,7 +340,7 @@ jobs:
     needs: validate
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         # We only use one ghc version the used one for the next release (defined at top of the workflow)
         # We need to build an array dynamically to inject the appropiate env var in a previous job,
         # see https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson
@@ -390,11 +380,11 @@ jobs:
 
   prerelease-head:
     name: Create a GitHub prerelease with the binary artifacts
-    runs-on: ubuntu-latest
+    runs-on: 'ubuntu-latest'
     if: github.ref == 'refs/heads/master'
 
     # IMPORTANT! Any job added to the workflow should be added here too
-    needs: [validate, validate-old-ghcs, build-alpine, dogfooding]
+    needs: ['validate', 'validate-old-ghcs', 'build-alpine', 'dogfooding']
 
     steps:
     - uses: actions/download-artifact@v3
@@ -433,9 +423,9 @@ jobs:
   validate-post-job:
     if: always()
     name: Validate post job
-    runs-on: ubuntu-latest
+    runs-on: 'ubuntu-latest'
     # IMPORTANT! Any job added to the workflow should be added here too
-    needs: [validate, validate-old-ghcs, build-alpine, dogfooding]
+    needs: ['validate', 'validate-old-ghcs', 'build-alpine', 'dogfooding']
 
     steps:
       - run: |