Merge pull request #5211 from commercialhaskell/stable-rename-snapshots

snoyberg · web-flow · commit effa1482cfdf · 2020-03-05T22:09:25.000+02:00
Stable rename snapshots
diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml
@@ -7,21 +7,20 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      stack-def:
+      GHC 8.2:
         BUILD: stack
-        STACK_YAML: stack.yaml
-      stack-lts-12:
+        STACK_YAML: stack-ghc-82.yaml
+      GHC 8.4:
         BUILD: stack
-        STACK_YAML: stack-lts-12.yaml
-      nightly:
+        STACK_YAML: stack-ghc-84.yaml
+      GHC 8.6:
         BUILD: stack
-        STACK_YAML: stack-nightly.yaml
+        STACK_YAML: stack-ghc-86.yaml
       style:
         BUILD: style
       pedantic:
         BUILD: pedantic
         STACK_YAML: stack.yaml
-    maxParallel: 5
   steps:
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
@@ -105,7 +104,7 @@ jobs:
       AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
       AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
     displayName: 'Installation ${{parameters.os}}'
-    continueOnError: ${{ eq(variables['STACK_YAML'], 'stack-nightly.yaml') }}
+    continueOnError: ${{ eq(variables['STACK_YAML'], 'stack-ghc-86.yaml') }}
   - script: |
       export PATH=$HOME/.local/bin:$PATH;
       export AWS_ACCESS_KEY_ID="$(AWS_ACCESS_KEY_ID)";
diff --git a/.azure/azure-nightly-template-linux.yml b/.azure/azure-nightly-template-linux.yml
@@ -5,11 +5,6 @@ jobs:
   - group: AWS_Keys
   pool:
     vmImage: ${{ parameters.vmImage }}
-  strategy:
-    matrix:
-      stack:
-        BUILD: stack
-    maxParallel: 1
   steps:
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
diff --git a/.azure/azure-nightly-template-osx.yml b/.azure/azure-nightly-template-osx.yml
@@ -5,11 +5,6 @@ jobs:
   - group: AWS_Keys
   pool:
     vmImage: ${{ parameters.vmImage }}
-  strategy:
-    matrix:
-      stack:
-        BUILD: stack
-    maxParallel: 1
   steps:
   - script: |
       export AWS_ACCESS_KEY_ID="$(AWS_ACCESS_KEY_ID)";
diff --git a/.azure/azure-nightly-template-windows.yml b/.azure/azure-nightly-template-windows.yml
@@ -5,11 +5,6 @@ jobs:
   - group: AWS_Keys
   pool:
     vmImage: ${{ parameters.vmImage }}
-  strategy:
-    matrix:
-      stack:
-        BUILD: stack
-    maxParallel: 1
   steps:
   - powershell: |
       [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
diff --git a/.azure/azure-osx-template.yml b/.azure/azure-osx-template.yml
@@ -4,12 +4,6 @@ jobs:
   - group: AWS_Keys
   pool:
     vmImage: ${{ parameters.vmImage }}
-  strategy:
-    matrix:
-      stack-def:
-        BUILD: stack
-        STACK_YAML: stack.yaml
-    maxParallel: 1
   steps:
   - script: |
       export AWS_ACCESS_KEY_ID="$(AWS_ACCESS_KEY_ID)";
@@ -31,7 +25,7 @@ jobs:
     env:
       OS_NAME: ${{ parameters.os }}
     displayName: 'Installation ${{parameters.os}}'
-    continueOnError: ${{ eq(variables['STACK_YAML'], 'stack-nightly.yaml') }}
+    continueOnError: ${{ eq(variables['STACK_YAML'], 'stack-ghc-86.yaml') }}
   - script: |
       export PATH=$HOME/.local/bin:$PATH;
       export AWS_ACCESS_KEY_ID="$(AWS_ACCESS_KEY_ID)";
diff --git a/.azure/azure-windows-template.yml b/.azure/azure-windows-template.yml
@@ -5,12 +5,6 @@ jobs:
   - group: AWS_Keys
   pool:
     vmImage: ${{ parameters.vmImage }}
-  strategy:
-    matrix:
-      stack:
-        BUILD: stack
-        STACK_YAML: stack.yaml
-    maxParallel: 1
   steps:
   - powershell: |
       [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
diff --git a/.hlint.yaml b/.hlint.yaml
@@ -82,3 +82,7 @@
 - error: {lhs: "Network.HTTP.Types.hContentMD5", rhs: "Network.HTTP.StackClient.hContentMD5"}
 - error: {lhs: "Network.HTTP.Types.methodPut", rhs: "Network.HTTP.StackClient.methodPut"}
 - ignore: {name: "Use alternative", within: "Network.HTTP.StackClient"}
+
+# Gives an incorrect hint that breaks type checking due to mismatched types
+- ignore: {name: "Too strict maybe", within: "Stack.Package" }
+- ignore: {name: "Too strict maybe", within: "Stack.Config" }
diff --git a/azure-nightly-pipeline.yml b/azure-nightly-pipeline.yml
@@ -1,5 +1,7 @@
 trigger: none
-pr: none
+pr:
+- master
+- stable
 
 schedules:
 - cron: "0 0 * * *"
diff --git a/doc/azure/azure-linux-template.yml b/doc/azure/azure-linux-template.yml
@@ -17,7 +17,6 @@ jobs:
         ARGS: "--resolver lts-15"
       nightly:
         ARGS: "--resolver nightly"
-    maxParallel: 6
   steps:
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
diff --git a/doc/azure/azure-osx-template.yml b/doc/azure/azure-osx-template.yml
@@ -17,7 +17,6 @@ jobs:
         ARGS: "--resolver lts-15"
       nightly:
         ARGS: "--resolver nightly"
-    maxParallel: 3
   steps:
   - script: |
       export PATH=$HOME/.local/bin:$PATH
diff --git a/doc/azure/azure-windows-template.yml b/doc/azure/azure-windows-template.yml
@@ -17,7 +17,6 @@ jobs:
         ARGS: "--resolver lts-15"
       nightly:
         ARGS: "--resolver nightly"
-    maxParallel: 3
   steps:
   - bash: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md
@@ -13,6 +13,7 @@
 * Look through https://fpcomplete.slack.com/files/U9U8HDGUC/FCM7UN5NJ/notes_on_doc_maintainers_releases_md.txt for hints on how to make this document more clear.
 * If `store` is no longer a dependency, likely can remove from stackage build constraints' `expected-test-failures`
 * Try using Alpine and https://github.com/redneb/ghc-alt-libc/releases to build linux 32-bit static binaries.  This will require upgrading GHC version used (e.g. to 8.6.5).  If this works out, switch over to the same for 64-bit static binaries (rather than static-haskell-nix).
+* Fix the reference to "latest nightly stackage snapshot" below to work with a new workflow based on the GHC-named stack.yaml files.
 
 ## Iterating on release process
 
diff --git a/etc/scripts/sdist-with-bounds.sh b/etc/scripts/sdist-with-bounds.sh
@@ -5,13 +5,13 @@ set -eu -o pipefail
 rootdir="$(cd "$(dirname "$0")/../.."; pwd)"
 stackbin=stack
 loweryaml=$rootdir/stack.yaml
-if [[ -f $rootdir/stack-lts-12.yaml ]]; then
-  midyaml=$rootdir/stack-lts-12.yaml
+if [[ -f $rootdir/stack-ghc-84.yaml ]]; then
+  midyaml=$rootdir/stack-ghc-84.yaml
 else
   midyaml=$rootdir/stack.yaml
 fi
-if [[ -f $rootdir/stack-nightly.yaml ]]; then
-  upperyaml=$rootdir/stack-nightly.yaml
+if [[ -f $rootdir/stack-ghc-86.yaml ]]; then
+  upperyaml=$rootdir/stack-ghc-86.yaml
 else
   upperyaml=$rootdir/stack.yaml
 fi
diff --git a/package.yaml b/package.yaml
@@ -31,7 +31,6 @@ extra-source-files:
 - ChangeLog.md
 - README.md
 - stack.yaml
-- snapshot.yaml
 - doc/*.md
 - src/setup-shim/StackSetupShim.hs
 - test/package-dump/ghc-7.10.txt
diff --git a/snapshot.yaml b/snapshot.yaml
diff --git a/stack-ghc-82.yaml b/stack-ghc-82.yaml
@@ -0,0 +1 @@
+stack.yaml
diff --git a/stack-ghc-84.yaml b/stack-ghc-84.yaml
@@ -1,7 +1,23 @@
 resolver: lts-12.26
-name: snapshot-for-building-stack-with-ghc-8.4.4
 
 packages:
+- .
+
+docker:
+  enable: false
+  repo: fpco/stack-build-small:lts-12.26
+
+nix:
+  # --nix on the command-line to enable.
+  enable: false
+  packages:
+    - zlib
+    - unzip
+
+ghc-options:
+   "$locals": -fhide-source-paths
+
+extra-deps:
 - Cabal-2.4.0.1@rev:0
 - hpack-0.31.2@rev:0
 - infer-license-0.2.0@rev:0 #for hpack-0.31
diff --git a/stack-ghc-86.yaml b/stack-ghc-86.yaml
@@ -1,7 +1,23 @@
 resolver: nightly-2019-07-15
-name: snapshot-for-building-stack-with-ghc-8.6.5
 
 packages:
+- .
+
+docker:
+  enable: false
+  repo: fpco/stack-build-small:lts-13.26
+
+nix:
+  # --nix on the command-line to enable.
+  enable: false
+  packages:
+    - zlib
+    - unzip
+
+ghc-options:
+   "$locals": -fhide-source-paths
+
+extra-deps:
 - github: snoyberg/filelock
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 - rio-0.1.11.0@rev:0
diff --git a/stack-lts-12.yaml b/stack-lts-12.yaml
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: snapshot.yaml
+resolver: lts-11.22
 
 packages:
 - .
@@ -19,3 +19,36 @@ flags:
 
 ghc-options:
    "$locals": -fhide-source-paths
+
+extra-deps:
+- ansi-terminal-0.9@rev:0
+- Cabal-2.4.0.1@rev:0
+- infer-license-0.2.0@rev:0 #for hpack-0.31
+- hpack-0.31.2@rev:0
+- githash-0.1.3.0@rev:0
+- rio-orphans-0.1.1.0@sha256:15600084c56ef4e1f22ac2091d10fa6ed62f01f531d819c6a5a19492212a76c9
+- yaml-0.10.4.0@rev:0 #for hpack-0.31
+- tar-conduit-0.3.0@sha256:c220b7a74b986445d08706aed77f17f82807d0133a5f3a760f53d587d20865b2,2928
+- hackage-security-0.5.3.0@rev:2
+- http-api-data-0.3.8.1@rev:1
+- cabal-doctest-1.0.6@rev:2
+- unliftio-0.2.12@rev:0 #for rio-0.1.11.0
+- happy-1.19.9@sha256:f8c774230735a390c287b2980cfcd2703d24d8dde85a01ea721b7b4b4c82944f,4667
+- fsnotify-0.3.0.1@rev:1
+- process-1.6.3.0@sha256:fc77cfe75a9653b8c54ae455ead8c06cb8adc4d7a340984d84d8ca880b579919,2370 #because of https://github.com/haskell/process/pull/101
+- persistent-2.9.2@rev:0
+- persistent-sqlite-2.9.3@rev:0
+- rio-0.1.11.0@rev:0
+- ansi-wl-pprint-0.6.8.2@rev:1 # for ansi-terminal-0.9
+- hedgehog-0.6.1@rev:4 # for ansi-terminal-0.9
+- typed-process-0.2.6.0@rev:0 # for rio-0.1.10.0
+- rio-prettyprint-0.1.0.0@rev:0
+- hi-file-parser-0.1.0.0@rev:0
+- http-download-0.1.0.1@rev:0
+- pantry-0.2.0.0
+- github: snoyberg/filelock
+  commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
+
+drop-packages:
+# See https://github.com/commercialhaskell/stack/pull/4712
+- cabal-install
