From 56813ed3e7b72e2417a216747f9e7eb5964035a1 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 16 Dec 2023 14:54:50 +0000
Subject: [PATCH] Sync NEWS.md from 1.11 branch

---
 Makefile.am | 19 +++++++++++++++++--
 NEWS.md     | 10 ++++++++++
 README.md   |  2 +-
 www/defs.m4 |  6 +++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b05ffdb4..4c559187 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,10 @@ include lib/synopsys/Makemodule.am
 include contrib/Makemodule.am
 include contrib/gui/Makemodule.am
 
+clean-local: clean-test clean-libs
+
+if MAINTAINER_MODE
+
 compile-commands:
 	$(MAKE) -C $(top_builddir) clean
 	bear -- $(MAKE) -j$$(nproc) -C $(top_builddir) $(bin_PROGRAMS) \
@@ -108,7 +112,18 @@ sync-branch:
 	git checkout $$branch $(top_srcdir)/www/defs.m4; \
 	sed -i 's/'$$last'/'$$new'/g' $(top_srcdir)/README.md
 
-clean-local: clean-test clean-libs
+upload-artifacts:
+	tag=$$(git describe) && \
+	gh release upload $$tag $(top_builddir)/$(DIST_ARCHIVES){,.sig} && \
+	run_id=$$(gh run list -w "Build MSYS2 and Ubuntu packages" \
+		  -L 1 --json headBranch,databaseId \
+		  --jq '.[0] | select(.headBranch == "'$$tag'").databaseId') && \
+	echo "Run ID : $$run_id" && \
+	mkdir -p /tmp/artifacts && \
+	gh run download $$run_id --dir /tmp/artifacts && \
+	find /tmp/artifacts -type f -print -exec gh release upload $$tag \{\} \;
+
+endif  # MAINTAINER_MODE
 
 .PHONY: cov-reset cov-report clean-test compile-commands
-.PHONY: release sync-branch
+.PHONY: release sync-branch upload-artifacts
diff --git a/NEWS.md b/NEWS.md
index 25dde749..0a479b1a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,15 @@
 ## Unreleased changes
 - The `--jit` elaboration option no longer requires `--no-save`.
+- Fixed a crash when subtype bounds depend on a package instance generic
+  (#815).
+
+## Version 1.11.1 - 2023-12-16
+- Fix crash during elaboration when an if-statement branch is always
+  taken (#812).
+- VHPI plugins can now access types in instantiated packages (from
+  @sean-anderson-seco).
+- The `--version` output now includes the bare Git commit SHA if the
+  program is built from a shallow clone with no tags (#813).
 
 ## Version 1.11.0 - 2023-12-06
 - New command `--cover-export` exports coverage data in the Cobertura
diff --git a/README.md b/README.md
index 411b395d..72473da5 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ NVC has both a release branch and a development master branch. The
 master branch should be stable enough for day-to-day use and has
 comprehensive regression tests, but the release branch is more suitable
 for third party packaging.  The latest released version is
-[1.11.0](https://github.com/nickg/nvc/releases/tag/r1.11.0).
+[1.11.1](https://github.com/nickg/nvc/releases/tag/r1.11.1).
 Significant changes since the last release are detailed in
 [NEWS.md](NEWS.md).
 
diff --git a/www/defs.m4 b/www/defs.m4
index e664728b..88317706 100644
--- a/www/defs.m4
+++ b/www/defs.m4
@@ -1,6 +1,6 @@
-define(__version, `1.11.0')dnl
-define(__release_date, `6th December 2023')dnl
-define(__release_date_short, `2023-12-06')dnl
+define(__version, `1.11.1')dnl
+define(__release_date, `16th December 2023')dnl
+define(__release_date_short, `2023-12-16')dnl
 define(__release_notes, `news.html#version-'__version`---'__release_date_short)dnl
 define(__github_url, `https://github.com/nickg/nvc')dnl
 define(__sourcehut_url, `https://git.sr.ht/~nickg/nvc')dnl
-- 
2.39.2