Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.6.1 #2091

Merged
merged 4 commits into from
Feb 11, 2022
Merged

Release 1.6.1 #2091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f75823c
Add `multiple_hidden` check to CI
martijnbastiaan Feb 11, 2022
db4a1d9
Add v1.6.1 to CHANGELOG.md
martijnbastiaan Feb 11, 2022
945c3e7
Bump to v1.6.1
martijnbastiaan Feb 11, 2022
7d11a2b
Disable multiple_hidden for 1.6.1
martijnbastiaan Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/bindist/linux/snap/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 21 additions & 8 deletions .ci/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Comment on lines +33 to +34
Copy link
Member

@DigitalBrains1 DigitalBrains1 Feb 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Christiaan, unless I'm quite mistaken, this prevents the multiple-hidden check on master. Also, if we don't commit the check to master, we might fall in the same trap for 1.8. So if this code cannot be added to master we should decide how we can add it to master instead of just not doing the check at all.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct @DigitalBrains1. We should commit it to master too. These commits should be forward ported:

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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 0 additions & 1 deletion changelog/2022-02-10T18_32_06+01_00_TryDomain_sized_types
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion clash-cores/clash-cores.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions clash-ghc/clash-ghc.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions clash-lib-hedgehog/clash-lib-hedgehog.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
4 changes: 2 additions & 2 deletions clash-lib/clash-lib.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions clash-prelude-hedgehog/clash-prelude-hedgehog.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
4 changes: 2 additions & 2 deletions clash-prelude/clash-prelude.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down