diff --git a/.ci/gitlab-ci.yml b/.ci/gitlab-ci.yml index 0d717789f..caa78f385 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: "1.11.0" + GTIRB_PPRINTER_VERSION: "1.9.0" + CAPSTONE_VERSION: "5.0.0-gt2" # 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. diff --git a/CHANGELOG.md b/CHANGELOG.md index 980c48eb6..206f6b9b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.6.0 (Unreleased) +# 1.6.0 * ARM: Improve code inference using unwind information from .ARM.exidx section * Replace symbolic expression attributes with composable labels. * ddisasm output now displays runtimes of "load", "compute", and "transform" diff --git a/conanfile.py b/conanfile.py index 86424cc95..c03b294b4 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 = "1.11.0" + gtirb_pprinter_version = "1.9.0" + capstone_version = "5.0.0-gt2" 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), )