From af2fd0b7860d660e7be728ea4c9c21d05ccda73d Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sun, 22 Sep 2024 01:19:42 +0000 Subject: [PATCH 1/2] ogma-cli: Constrain version of dependency. Refs #151. jsonpath uses a function that is only available in aeson >= 2.0.3.0, but the dependency only requires aeson >= 2. This breaks the installation in the CI jobs if aeson >= 2 && aeson < 2.0.3.0 is picked. This commit modifies the CI jobs adding a constraint in the installation of ogma to require aeson greater than 2.0.2.0. --- .github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml | 2 +- .github/workflows/repo-ghc-8.6-cabal-2.4.yml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml b/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml index be899c4..4b2a072 100644 --- a/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml +++ b/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml @@ -43,7 +43,7 @@ jobs: - name: Install ogma run: | - cabal v1-install copilot ogma-**/ --constraint="copilot >= 3.19.1" + cabal v1-install copilot ogma-**/ --constraint="copilot >= 3.19.1" --constraint="aeson >= 2.0.3.0" - name: Generate ROS app run: | diff --git a/.github/workflows/repo-ghc-8.6-cabal-2.4.yml b/.github/workflows/repo-ghc-8.6-cabal-2.4.yml index 4eaa7bb..71fade8 100644 --- a/.github/workflows/repo-ghc-8.6-cabal-2.4.yml +++ b/.github/workflows/repo-ghc-8.6-cabal-2.4.yml @@ -53,11 +53,10 @@ jobs: # the dependencies do not change and cabal does not change the # installation plan (which would mean we'd be running the tests with a # version of ogma compiled with different dependencies). - cabal v1-install ogma-**/ --enable-tests - + cabal v1-install ogma-**/ --enable-tests --constraint="aeson >= 2.0.3.0" - name: Test all packages run: | # We want to document the build process, and get detailed information # if there is a problem (or if all goes well). We therefore execute the # installation with -j1. - cabal v1-install ogma-**/ --enable-tests --run-tests -j1 + cabal v1-install ogma-**/ --enable-tests --run-tests -j1 --constraint="aeson >= 2.0.3.0" From b490ab0efe81f891e96b0a78b45babf16ead30a0 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sun, 22 Sep 2024 01:21:49 +0000 Subject: [PATCH 2/2] ogma-cli: Document changes in CHANGELOG. Refs #151. --- ogma-cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index d0b405d..fc024d1 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-cli +## [1.4.X] - 2024-09-21 + +* Constrain version of dependency in CI jobs (#151). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145).