Skip to content

Commit 36c20e7

Browse files
martijnbastiaanmartijnbastiaan
authored
Merge pull request #2091 from clash-lang/release-1.6.1
Release 1.6.1
2 parents 63db66d + 7d11a2b commit 36c20e7

File tree

11 files changed

+42
-23
lines changed

11 files changed

+42
-23
lines changed

‎.ci/bindist/linux/snap/snap/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: clash
2-
version: '1.6.0'
2+
version: '1.6.1'
33
summary: 'Clash: from Haskell to hardware'
44
description: |
55
Clash is a functional hardware description language that borrows both its

‎.ci/setup.sh

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,29 @@ CI_COMMIT_TAG=${CI_COMMIT_TAG:-}
3030
version=$(echo $versions | tr ' ' '\n' | head -n 1)
3131
tag_version=${CI_COMMIT_TAG:1:${#CI_COMMIT_TAG}-1} # Strip first character (v0.99 -> 0.99)
3232

33-
if [[ ${tag_version} != "" && ${version} != ${tag_version} ]]; then
34-
if [[ "${CI_COMMIT_TAG:0:1}" == "v" ]]; then
35-
echo "Tag name and distribution's release number should match:"
36-
echo " Tag version: ${CI_COMMIT_TAG}"
37-
echo " Distribution version: v${version}"
38-
exit 1;
39-
else
40-
echo "\$CI_COMMIT_TAG should start with a 'v'. Found: ${CI_COMMIT_TAG}"
33+
# `tag_version` is set when a tag has been created on GitHub. We use this to
34+
# trigger a release pipeline (release to Snap / Hackage).
35+
if [[ ${tag_version} != "" ]]; then
36+
37+
if [[ ${version} != ${tag_version} ]]; then
38+
if [[ "${CI_COMMIT_TAG:0:1}" == "v" ]]; then
39+
echo "Tag name and distribution's release number should match:"
40+
echo " Tag version: ${CI_COMMIT_TAG}"
41+
echo " Distribution version: v${version}"
42+
exit 1;
43+
else
44+
echo "\$CI_COMMIT_TAG should start with a 'v'. Found: ${CI_COMMIT_TAG}"
45+
exit 1;
46+
fi
47+
fi
48+
49+
set +e
50+
grep "flag multiple-hidden" -A 7 clash-prelude/clash-prelude.cabal | grep -q "default: False"
51+
if [[ $? != 0 ]]; then
52+
echo "multiple_hidden flag should be disabled by default on releases!"
4153
exit 1;
4254
fi
55+
set -e
4356
fi
4457

4558
# Print out versions for debugging purposes

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Changelog for the Clash project
2+
## 1.6.1 *Feb 11th 2022*
3+
Changed:
4+
* 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.
5+
6+
Added:
7+
* `Clash.Class.HasDomain.TryDomain` instances for Clash sized types
8+
29
## 1.6.0 *Feb 10th 2022*
310
Added:
411
* `Clash.Class.Counter`: a class that defines a odometer-style supercounter. [#1763](https://github.com/clash-lang/clash-compiler/pull/1763)

‎changelog/2022-02-10T18_32_06+01_00_TryDomain_sized_types

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎clash-cores/clash-cores.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.2
22

33
name: clash-cores
4-
version: 1.6.0
4+
version: 1.6.1
55
synopsis: A collection of IP cores for Clash
66
description: A collection of IP cores for Clash
77
bug-reports: https://github.com/clash-lang/clash-cores/issues

‎clash-ghc/clash-ghc.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Cabal-version: 2.2
22
Name: clash-ghc
3-
Version: 1.6.0
3+
Version: 1.6.1
44
Synopsis: Clash: a functional hardware description language - GHC frontend
55
Description:
66
Clash is a functional hardware description language that borrows both its
@@ -152,8 +152,8 @@ library
152152
transformers >= 0.5.2.0 && < 0.7,
153153
unordered-containers >= 0.2.1.0 && < 0.3,
154154

155-
clash-lib == 1.6.0,
156-
clash-prelude == 1.6.0,
155+
clash-lib == 1.6.1,
156+
clash-prelude == 1.6.1,
157157
concurrent-supply >= 0.1.7 && < 0.2,
158158
ghc-typelits-extra >= 0.3.2 && < 0.5,
159159
ghc-typelits-knownnat >= 0.6 && < 0.8,

‎clash-lib-hedgehog/clash-lib-hedgehog.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.2
22

33
name: clash-lib-hedgehog
4-
version: 1.6.0
4+
version: 1.6.1
55
synopsis: Hedgehog Generators for clash-lib
66
description: Hedgehog Generators for clash-lib
77
bug-reports: https://github.com/clash-lang/clash-compiler/issues
@@ -65,4 +65,4 @@ library
6565
text >= 1.2.2 && < 1.4,
6666
transformers >= 0.5.2.0 && < 0.7,
6767

68-
clash-lib == 1.6.0,
68+
clash-lib == 1.6.1,

‎clash-lib/clash-lib.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Cabal-version: 2.2
22
Name: clash-lib
3-
Version: 1.6.0
3+
Version: 1.6.1
44
Synopsis: Clash: a functional hardware description language - As a library
55
Description:
66
Clash is a functional hardware description language that borrows both its
@@ -136,7 +136,7 @@ Library
136136
base16-bytestring >= 0.1.1 && < 1.1,
137137
binary >= 0.8.5 && < 0.11,
138138
bytestring >= 0.10.0.2 && < 0.12,
139-
clash-prelude == 1.6.0,
139+
clash-prelude == 1.6.1,
140140
concurrent-supply >= 0.1.7 && < 0.2,
141141
containers >= 0.5.0.0 && < 0.7,
142142
cryptohash-sha256 >= 0.11 && < 0.12,

‎clash-prelude-hedgehog/clash-prelude-hedgehog.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.2
22

33
name: clash-prelude-hedgehog
4-
version: 1.6.0
4+
version: 1.6.1
55
synopsis: Hedgehog Generators for clash-prelude
66
description: Hedgehog Generators for clash-prelude
77
bug-reports: https://github.com/clash-lang/clash-compiler/issues
@@ -53,4 +53,4 @@ library
5353
ghc-typelits-natnormalise >= 0.7.2 && < 0.8,
5454
text >= 1.2.2 && < 1.4,
5555

56-
clash-prelude == 1.6.0,
56+
clash-prelude == 1.6.1,

‎clash-prelude/clash-prelude.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Cabal-version: 2.2
22
Name: clash-prelude
3-
Version: 1.6.0
3+
Version: 1.6.1
44
Synopsis: Clash: a functional hardware description language - Prelude library
55
Description:
66
Clash is a functional hardware description language that borrows both its
@@ -96,7 +96,7 @@ flag multiple-hidden
9696
experimental feature, possibly triggering confusing error messages. By
9797
default, it is enabled on development versions of Clash and disabled on
9898
releases.
99-
default: True
99+
default: False
100100
manual: True
101101

102102
flag doctests

0 commit comments

Comments
 (0)