Merge pull request #2091 from clash-lang/release-1.6.1

Release 1.6.1
clash-lang · Feb 11, 2022 · 36c20e7 · 36c20e7
2 parents 63db66d + 7d11a2b
commit 36c20e7
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 23 deletions.
diff --git a/.ci/bindist/linux/snap/snap/snapcraft.yaml b/.ci/bindist/linux/snap/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: clash
-version: '1.6.0'
+version: '1.6.1'
 summary: 'Clash: from Haskell to hardware'
 description: |
   Clash is a functional hardware description language that borrows both its

diff --git a/.ci/setup.sh b/.ci/setup.sh
@@ -30,16 +30,29 @@ CI_COMMIT_TAG=${CI_COMMIT_TAG:-}
 version=$(echo $versions | tr ' ' '\n' | head -n 1)
 tag_version=${CI_COMMIT_TAG:1:${#CI_COMMIT_TAG}-1}  # Strip first character (v0.99 -> 0.99)
 
-if [[ ${tag_version} != "" && ${version} != ${tag_version} ]]; then
-    if [[ "${CI_COMMIT_TAG:0:1}" == "v" ]]; then
-        echo "Tag name and distribution's release number should match:"
-        echo "  Tag version:          ${CI_COMMIT_TAG}"
-        echo "  Distribution version: v${version}"
-        exit 1;
-    else
-        echo "\$CI_COMMIT_TAG should start with a 'v'. Found: ${CI_COMMIT_TAG}"
+# `tag_version` is set when a tag has been created on GitHub. We use this to
+# trigger a release pipeline (release to Snap / Hackage).
+if [[ ${tag_version} != "" ]]; then
+
+    if [[ ${version} != ${tag_version} ]]; then
+        if [[ "${CI_COMMIT_TAG:0:1}" == "v" ]]; then
+            echo "Tag name and distribution's release number should match:"
+            echo "  Tag version:          ${CI_COMMIT_TAG}"
+            echo "  Distribution version: v${version}"
+            exit 1;
+        else
+            echo "\$CI_COMMIT_TAG should start with a 'v'. Found: ${CI_COMMIT_TAG}"
+            exit 1;
+        fi
+    fi
+
+    set +e
+    grep "flag multiple-hidden" -A 7 clash-prelude/clash-prelude.cabal | grep -q "default: False"
+    if [[ $? != 0 ]]; then
+        echo "multiple_hidden flag should be disabled by default on releases!"
         exit 1;
     fi
+    set -e
 fi
 
 # Print out versions for debugging purposes

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog for the Clash project
+## 1.6.1 *Feb 11th 2022*
+Changed:
+  * We accidentally released `v1.6.0` with the Cabal flag `multiple-hidden` enabled. This is an experimental feature, supposed to be disabled by default for releases. `v1.6.1` disables it again.
+
+Added:
+  * `Clash.Class.HasDomain.TryDomain` instances for Clash sized types
+
 ## 1.6.0 *Feb 10th 2022*
 Added:
   * `Clash.Class.Counter`: a class that defines a odometer-style supercounter. [#1763](https://github.com/clash-lang/clash-compiler/pull/1763)

diff --git a/changelog/2022-02-10T18_32_06+01_00_TryDomain_sized_types b/changelog/2022-02-10T18_32_06+01_00_TryDomain_sized_types
diff --git a/clash-cores/clash-cores.cabal b/clash-cores/clash-cores.cabal
@@ -1,7 +1,7 @@
 cabal-version:       2.2
 
 name:                clash-cores
-version:             1.6.0
+version:             1.6.1
 synopsis:            A collection of IP cores for Clash
 description:         A collection of IP cores for Clash
 bug-reports:         https://github.com/clash-lang/clash-cores/issues

diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal
@@ -1,6 +1,6 @@
 Cabal-version:        2.2
 Name:                 clash-ghc
-Version:              1.6.0
+Version:              1.6.1
 Synopsis:             Clash: a functional hardware description language - GHC frontend
 Description:
   Clash is a functional hardware description language that borrows both its
@@ -152,8 +152,8 @@ library
                       transformers              >= 0.5.2.0  && < 0.7,
                       unordered-containers      >= 0.2.1.0  && < 0.3,
 
-                      clash-lib                 == 1.6.0,
-                      clash-prelude             == 1.6.0,
+                      clash-lib                 == 1.6.1,
+                      clash-prelude             == 1.6.1,
                       concurrent-supply         >= 0.1.7    && < 0.2,
                       ghc-typelits-extra        >= 0.3.2    && < 0.5,
                       ghc-typelits-knownnat     >= 0.6      && < 0.8,

diff --git a/clash-lib-hedgehog/clash-lib-hedgehog.cabal b/clash-lib-hedgehog/clash-lib-hedgehog.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 
 name:               clash-lib-hedgehog
-version:            1.6.0
+version:            1.6.1
 synopsis:           Hedgehog Generators for clash-lib
 description:        Hedgehog Generators for clash-lib
 bug-reports:        https://github.com/clash-lang/clash-compiler/issues
@@ -65,4 +65,4 @@ library
     text                      >= 1.2.2   && < 1.4,
     transformers              >= 0.5.2.0 && < 0.7,
 
-    clash-lib                 == 1.6.0,
+    clash-lib                 == 1.6.1,
diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal
@@ -1,6 +1,6 @@
 Cabal-version:        2.2
 Name:                 clash-lib
-Version:              1.6.0
+Version:              1.6.1
 Synopsis:             Clash: a functional hardware description language - As a library
 Description:
   Clash is a functional hardware description language that borrows both its
@@ -136,7 +136,7 @@ Library
                       base16-bytestring       >= 0.1.1    && < 1.1,
                       binary                  >= 0.8.5    && < 0.11,
                       bytestring              >= 0.10.0.2 && < 0.12,
-                      clash-prelude           == 1.6.0,
+                      clash-prelude           == 1.6.1,
                       concurrent-supply       >= 0.1.7    && < 0.2,
                       containers              >= 0.5.0.0  && < 0.7,
                       cryptohash-sha256       >= 0.11     && < 0.12,

diff --git a/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal b/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 
 name:               clash-prelude-hedgehog
-version:            1.6.0
+version:            1.6.1
 synopsis:           Hedgehog Generators for clash-prelude
 description:        Hedgehog Generators for clash-prelude
 bug-reports:        https://github.com/clash-lang/clash-compiler/issues
@@ -53,4 +53,4 @@ library
     ghc-typelits-natnormalise >= 0.7.2   && < 0.8,
     text                      >= 1.2.2   && < 1.4,
 
-    clash-prelude             == 1.6.0,
+    clash-prelude             == 1.6.1,
diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal
@@ -1,6 +1,6 @@
 Cabal-version:        2.2
 Name:                 clash-prelude
-Version:              1.6.0
+Version:              1.6.1
 Synopsis:             Clash: a functional hardware description language - Prelude library
 Description:
   Clash is a functional hardware description language that borrows both its
@@ -96,7 +96,7 @@ flag multiple-hidden
     experimental feature, possibly triggering confusing error messages. By
     default, it is enabled on development versions of Clash and disabled on
     releases.
-  default: True
+  default: False
   manual: True
 
 flag doctests

diff --git a/docs/conf.py b/docs/conf.py
@@ -28,7 +28,7 @@
 project = 'Clash'
 copyright = '2017-2019, The Clash Developers'
 author = 'The Clash Developers'
-version = '1.6.0'
+version = '1.6.1'
 release = version
 
 # Syntax highlighting