From 11d6ba92cefa2e4670678c2014a595ccc626390f Mon Sep 17 00:00:00 2001 From: Jonathan Dorn Date: Thu, 13 Jun 2024 17:56:41 -0400 Subject: [PATCH] Release 1.9.0 --- .ci/gitlab-ci.yml | 24 ++++++++++++------------ CHANGELOG.md | 2 +- conanfile.py | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.ci/gitlab-ci.yml b/.ci/gitlab-ci.yml index 5eaef36f..adb3e494 100644 --- a/.ci/gitlab-ci.yml +++ b/.ci/gitlab-ci.yml @@ -1,7 +1,7 @@ variables: - GTIRB_VERSION: "" - GTIRB_PPRINTER_VERSION: "" - CAPSTONE_VERSION: "" + GTIRB_VERSION: "2.1.0" + GTIRB_PPRINTER_VERSION: "2.2.0" + CAPSTONE_VERSION: "5.0.1-gt" # The IMAGE_TAG is derived from the branch name so that if a branch modifies # the CI images, it builds and runs using the new images without conflicting # with main. @@ -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 index 009e7c7d..43fc0bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.9.0 (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/conanfile.py b/conanfile.py index 1b1fe50d..c84d7c32 100644 --- a/conanfile.py +++ b/conanfile.py @@ -89,13 +89,13 @@ def build_requirements(self): self.build_requires("ninja/1.10.2") boost_version = "1.69.0" - gtirb_version = "dev" - gtirb_pprinter_version = "dev" - capstone_version = "dev" + gtirb_version = "2.1.0" + gtirb_pprinter_version = "2.2.0" + capstone_version = "5.0.1-gt" requires = ( "boost/%s" % (boost_version), - "gtirb/%s@rewriting+gtirb/master" % (gtirb_version), - "gtirb-pprinter/%s@rewriting+gtirb-pprinter/master" + "gtirb/%s@rewriting+gtirb/stable" % (gtirb_version), + "gtirb-pprinter/%s@rewriting+gtirb-pprinter/stable" % (gtirb_pprinter_version), "capstone/%s@rewriting+extra-packages/next" % (capstone_version), )