Merge pull request #1468 from AmpersandTarski/stack-issue-6477

Stack issue 6477

.github/workflows/ci2.yml

@@ -48,7 +48,7 @@ jobs:
         with:
           mysql-version: "mariadb-10.6"
       - name: Build and test 🏗 🧪
-        uses: freckle/stack-action@main # stack-action does all these steps: dependencies, build, test.
+        uses: freckle/stack-action@v4 # stack-action does all these steps: dependencies, build, test.
         with:
           stack-arguments: "--copy-bins --flag ampersand:buildAll"
 
@@ -65,7 +65,7 @@ jobs:
         with:
           mysql-version: "mariadb-10.6"
       - name: Build and test  🏗 🧪
-        uses: freckle/stack-action@main
+        uses: freckle/stack-action@v4
         with:
           stack-arguments: "--copy-bins --flag ampersand:buildAll"
 
@@ -94,6 +94,6 @@ jobs:
           php-version: "8.0"
           extensions: mysqli
       - name: Build and test 🏗 🧪
-        uses: freckle/stack-action@main
+        uses: freckle/stack-action@v4
         with:
           stack-arguments: "--copy-bins --flag ampersand:buildAll"

.github/workflows/codeQuality.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Use cache when available 📦
         uses: freckle/stack-cache-action@main
       - name: Build the project 🌿🌿🌿
-        uses: freckle/stack-action@v3.2.2
+        uses: freckle/stack-action@v4
         with:
           test: false
 

.github/workflows/release.yml

@@ -153,7 +153,7 @@ jobs:
         with:
           mysql-version: "mariadb-10.6"
       - name: Build and test 🏗 🧪
-        uses: freckle/stack-action@main # stack-action does all these steps: dependencies, build, test.
+        uses: freckle/stack-action@v4 # stack-action does all these steps: dependencies, build, test.
         with:
           stack-arguments: "--copy-bins --flag ampersand:buildAll"
       - name: Upload artifacts (Linux)
@@ -175,9 +175,9 @@ jobs:
         with:
           mysql-version: "mariadb-10.6"
       - name: Build and test  🏗 🧪
-        uses: freckle/stack-action@main
+        uses: freckle/stack-action@v4
         with:
-          stack-arguments: "--copy-bins --flag ampersand:buildAll"
+          stack-arguments: "--copy-bins --flag ampersand:buildAll --verbose"
       - name: Upload artifacts (macOS)
         uses: actions/upload-artifact@v2
         with:
@@ -209,7 +209,7 @@ jobs:
           php-version: "8.0"
           extensions: mysqli
       - name: Build and test 🏗 🧪
-        uses: freckle/stack-action@main
+        uses: freckle/stack-action@v4
         with:
           stack-arguments: "--copy-bins --flag ampersand:buildAll"
       - name: Upload artifacts (Windows)

ReleaseNotes.md

@@ -1,5 +1,8 @@
 # Release notes of Ampersand
 
+## v5.0.2 (21 february 2024)
+- Eliminated warnings and hints in CI/CD and in Haskell code. Doing some tests for a [strange issue with stack](https://github.com/commercialhaskell/stack/issues/6477)
+
 ## v5.0.1 (5 february 2024)
 - Some adaptions to w.r.t. the namespaces, in the generated funcional specification.
 

ampersand.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           ampersand
-version:        5.0.1
+version:        5.0.2
 synopsis:       Toolsuite for automated design of enterprise information systems.
 description:    You can define your business processes by means of rules, written in Relation Algebra.
 category:       Database Design

package.yaml

@@ -1,5 +1,5 @@
 name: ampersand
-version: 5.0.1
+version: 5.0.2
 author: Stef Joosten
 maintainer: stef.joosten@ou.nl
 synopsis: Toolsuite for automated design of enterprise information systems.

src/Ampersand/Output/ToJSON/Interfaces.hs

@@ -134,7 +134,7 @@ instance JSON TemplateKeyValue JSONTemplateKeyValue where
 instance JSON Interface JSONInterface where
   fromAmpersand env fSpec interface =
     JSONInterface
-      { ifcJSONname = fullName $ interface,
+      { ifcJSONname = fullName interface,
         ifcJSONlabel = label interface,
         ifcJSONifcObject = fromAmpersand env fSpec (BxExpr $ ifcObj interface),
         ifcJSONisAPI = ifcIsAPI interface

src/Ampersand/Output/ToJSON/Rules.hs

@@ -65,7 +65,7 @@ instance JSON FSpec Rulez where
 instance JSON Rule JsonRule where
   fromAmpersand env fSpec rule =
     JsonRule
-      { rulJSONname = fullName $ rule,
+      { rulJSONname = fullName rule,
         rulJSONlabel = label rule,
         rulJSONruleAdl = showA . formalExpression $ rule,
         rulJSONorigin = tshow . origin $ rule,

src/Ampersand/Output/ToJSON/Views.hs

@@ -35,7 +35,7 @@ instance JSON FSpec Views where
 instance JSON ViewDef View where
   fromAmpersand env fSpec vd =
     View
-      { vwJSONname = fullName $ vd,
+      { vwJSONname = fullName vd,
         vwJSONlabel = label vd,
         vwJSONconceptName = text1ToText . idWithoutType' . vdcpt $ vd,
         vwJSONisDefault = vdIsDefault vd,

src/Ampersand/Output/ToPandoc/ChapterDataAnalysis.hs

@@ -259,10 +259,10 @@ chpDataAnalysis env fSpec = (theBlocks, [])
                          (plain . text . l) (NL "Target", EN "Target"),
                          (plain . text . l) (NL "uniek", EN "unique")
                        ]
-                       [ [ (plain . text) ((label . source) rel <> "(" <> tshow nSrcConcept <> ")"), -- use "tshow.attType" for the technical type.
+                       [ [ (plain . text) (label (source rel) <> "(" <> tshow nSrcConcept <> ")"), -- use "tshow.attType" for the technical type.
                            (plain . text) (percent (Set.size (Set.map apLeft pairs)) nSrcConcept),
-                           (plain . text) ((label) rel <> "(" <> tshow (Set.size pairs) <> ")"),
-                           (plain . text) ((label . target) rel <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
+                           (plain . text) (label rel <> "(" <> tshow (Set.size pairs) <> ")"),
+                           (plain . text) (label (target rel) <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
                            (plain . text) (percent (Set.size (Set.map apRight pairs)) nTgtConcept)
                          ]
                          | Just rel <- map assmdcl asscs,
@@ -519,15 +519,15 @@ primExpr2pandocMath lang e =
        in case lang of
             Dutch -> text "de identiteitsrelatie van "
             English -> text "the identityrelation of "
-            <> math (label $ srcTable)
+            <> math (label srcTable)
     (EDcI c) ->
       case lang of
         Dutch -> text "de identiteitsrelatie van "
         English -> text "the identityrelation of "
-        <> math (label $ c)
+        <> math (label c)
     (EEps c _) ->
       case lang of
         Dutch -> text "de identiteitsrelatie van "
         English -> text "the identityrelation of "
-        <> math (label $ c)
+        <> math (label c)
     _ -> fatal ("Have a look at the generated Haskell to see what is going on..\n" <> tshow e)