Shorten GHC names to use minor version only

codedownio · May 10, 2024 · 04bdbe5 · 04bdbe5
1 parent 87377b3
commit 04bdbe5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/.aliases/upload-to-github b/.aliases/upload-to-github
@@ -14,7 +14,7 @@ BUILT=$(nix build .#githubArtifacts --no-link --json | jq -r '.[0].outputs.out')
 echo "Built: $BUILT"
 ls "$BUILT"
 
-VERSION="$(nix eval .#ghc928-static.version --raw)"
+VERSION="$(nix eval .#ghc92-static.version --raw)"
 echo "Got version: $VERSION"
 
 IFS=$'\n'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,8 +62,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - output: "ghc902"
-        - output: "ghc902-static"
+        # Test one non-static one
+        - output: "ghc90"
+
+        - output: "ghc810-static"
+        - output: "ghc90-static"
+        - output: "ghc92-static"
+        - output: "ghc94-static"
+        - output: "ghc96-static"
+        - output: "ghc98-static"
     steps:
     - uses: actions/checkout@v3
 
@@ -81,17 +88,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ghc: "8.10.7"
+        - ghc: "8.10"
           yaml: "stack/stack-8.10.7.yaml"
-        - ghc: "9.0.2"
+        - ghc: "9.0"
           yaml: "stack/stack-9.0.2.yaml"
-        - ghc: "9.2.8"
+        - ghc: "9.2"
           yaml: "stack/stack-9.2.8.yaml"
-        - ghc: "9.4.8"
+        - ghc: "9.4"
           yaml: "stack/stack-9.4.8.yaml"
-        - ghc: "9.6.4"
+        - ghc: "9.6"
           yaml: "stack/stack-9.6.4.yaml"
-        - ghc: "9.8.2"
+        - ghc: "9.8"
           yaml: "stack/stack-9.8.2.yaml"
 
     steps:

diff --git a/flake.nix b/flake.nix
@@ -61,15 +61,15 @@
 
         allVersions = with pkgs.lib; listToAttrs (
           concatMap (info: [
-            (nameValuePair info.name (flake info.name (srcWithStackYaml info.stackYaml)).packages.${exeAttr})
-            (nameValuePair "${info.name}-static" (flakeStatic info.name (srcWithStackYaml info.stackYaml)).packages.${exeAttr})
+            (nameValuePair info.name (flake info.ghc (srcWithStackYaml info.stackYaml)).packages.${exeAttr})
+            (nameValuePair "${info.name}-static" (flakeStatic info.ghc (srcWithStackYaml info.stackYaml)).packages.${exeAttr})
           ]) [
-            { name = "ghc8107"; stackYaml = "stack/stack-8.10.7.yaml"; }
-            { name = "ghc902"; stackYaml = "stack/stack-9.0.2.yaml"; }
-            { name = "ghc928"; stackYaml = "stack/stack-9.2.8.yaml"; }
-            { name = "ghc948"; stackYaml = "stack/stack-9.4.8.yaml"; }
-            { name = "ghc964"; stackYaml = "stack/stack-9.6.4.yaml"; }
-            { name = "ghc982"; stackYaml = "stack/stack-9.8.2.yaml"; }
+            { name = "ghc810"; ghc = "ghc8107"; stackYaml = "stack/stack-8.10.7.yaml"; }
+            { name = "ghc90"; ghc = "ghc902"; stackYaml = "stack/stack-9.0.2.yaml"; }
+            { name = "ghc92"; ghc = "ghc928"; stackYaml = "stack/stack-9.2.8.yaml"; }
+            { name = "ghc94"; ghc = "ghc948"; stackYaml = "stack/stack-9.4.8.yaml"; }
+            { name = "ghc96"; ghc = "ghc964"; stackYaml = "stack/stack-9.6.4.yaml"; }
+            { name = "ghc98"; ghc = "ghc982"; stackYaml = "stack/stack-9.8.2.yaml"; }
           ]
         );