Merge branch 'bump-version' into 'main'

Bump version after release See merge request rewriting/ddisasm!1210
GrammaTech · Jun 14, 2024 · 4e3349b · 4e3349b
2 parents a2e0a6b + 7f98b58
commit 4e3349b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.ci/gitlab-ci.yml b/.ci/gitlab-ci.yml
@@ -55,23 +55,23 @@ default:
   # Use aptitude to make sure gtirb-pprinter is installed even if that means installing an old gtirb
   - >-
     aptitude install --download-only -y -o "Aptitude::ProblemResolver::Hints::=reject gtirb-pprinter :UNINST"
-    libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
-    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION}
-    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
-    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
+    libcapstone-dev${CAPSTONE_VERSION:+=1:$CAPSTONE_VERSION}
+    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION-$(lsb_release -sc)}
+    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION-$(lsb_release -sc)}
+    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION-$(lsb_release -sc)}
   - mv /var/cache/apt/archives/*.deb .
 
 .install-deps:
   # Use aptitude to make sure gtirb-pprinter is installed even if that means installing an old gtirb
   - >-
     aptitude install -y -o "Aptitude::ProblemResolver::Hints::=reject gtirb-pprinter :UNINST"
-    libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
-    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION}
-    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
-    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
+    libcapstone-dev${CAPSTONE_VERSION:+=1:$CAPSTONE_VERSION}
+    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION-$(lsb_release -sc)}
+    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION-$(lsb_release -sc)}
+    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION-$(lsb_release -sc)}
 
 .install-capstone:
-  - apt-get install -y libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
+  - apt-get install -y libcapstone-dev${CAPSTONE_VERSION:+=1:$CAPSTONE_VERSION}
 
 # Set up ccache and report initial stats.
 .setup-ccache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
-# 1.9.0 (Unreleased)
+# 1.9.1 (Unreleased)
+
+# 1.9.0
 
 * Stop generating debian metapackages and packages with the version attached
   to the package name. Updates in the apt-repository now support multiple

diff --git a/version.txt b/version.txt
@@ -1,3 +1,3 @@
 VERSION_MAJOR 1
 VERSION_MINOR 9
-VERSION_PATCH 0
+VERSION_PATCH 1