From 9eb12d7327b90747d961a85e3f7f11b83983752f Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:27:00 -0400 Subject: [PATCH 01/20] Update CI matrix --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 493afc0..6a88be8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,8 @@ jobs: - "9.0.2" - "9.2.3" fdb-version: + - "7.3.15" + - "7.2.7" - "7.1.15" - "7.0.0" - "6.3.12" @@ -39,6 +41,8 @@ jobs: - "630" - "700" - "710" + - "720" + - "730" # For a given installed FDB version, the client can choose to connect # with an older version, but not a newer. This clumsily enforces that # rule. From 06e12580216f7fbe67d73363ec646dfbfa854095 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:33:14 -0400 Subject: [PATCH 02/20] Fix CI python --- ci/install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 3ba8f2d..e9da3c7 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -2,7 +2,7 @@ FDB_VER=${1} -sudo apt install python +sudo apt install python-is-python3 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb sudo dpkg -i foundationdb-clients_${FDB_VER}-1_amd64.deb From 038b7c68e383ef6202eef3ae5dad814acbcf81eb Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:39:05 -0400 Subject: [PATCH 03/20] Newer GHC versions --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a88be8..fe19c77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,8 @@ jobs: os: [ubuntu-latest] cabal: ["3.4"] ghc: - - "8.10.7" - - "9.0.2" - - "9.2.3" + - "9.4.6" + - "9.6.2" fdb-version: - "7.3.15" - "7.2.7" @@ -114,12 +113,12 @@ jobs: strategy: fail-fast: false matrix: - stack: ["2.1.3"] - ghc: ["8.8.3"] + stack: ["2.11.1"] + ghc: ["9.4.6"] fdb-version: - - "7.1.15" + - "7.3.15" fdb-api-version: - - "710" + - "730" steps: - uses: actions/checkout@v2 From d089c0d0d746ee8737f5174b5249433af24d578c Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:39:15 -0400 Subject: [PATCH 04/20] Install python 2 explicitly --- ci/install-deps.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index e9da3c7..91f1c71 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -1,8 +1,10 @@ #!/bin/bash +set -e + FDB_VER=${1} -sudo apt install python-is-python3 +sudo apt install python2 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb sudo dpkg -i foundationdb-clients_${FDB_VER}-1_amd64.deb From d4b0ea121f0eb5c8d54856a5dc03cae3259fa130 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:44:01 -0400 Subject: [PATCH 05/20] Oops rebaseme --- ci/export-fdb-version-flag-cabal.sh | 6 ++++++ ci/export-fdb-version-flag-stack.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ci/export-fdb-version-flag-cabal.sh b/ci/export-fdb-version-flag-cabal.sh index 46839e0..261e4e6 100755 --- a/ci/export-fdb-version-flag-cabal.sh +++ b/ci/export-fdb-version-flag-cabal.sh @@ -27,6 +27,12 @@ elif [[ ${FDB_VER} = "7.0.0" ]] then export FDB_VER_FLAG='-f fdb-version-700' elif [[ ${FDB_VER} = "7.1.15" ]] +then + export FDB_VER_FLAG='-f fdb-version-710' +elif [[ ${FDB_VER} = "7.2.7" ]] +then + export FDB_VER_FLAG='-f fdb-version-720' +elif [[ ${FDB_VER} = "7.3.15" ]] then # latest is the default, so no flag is specified export FDB_VER_FLAG='' diff --git a/ci/export-fdb-version-flag-stack.sh b/ci/export-fdb-version-flag-stack.sh index efbcc56..7ce836f 100755 --- a/ci/export-fdb-version-flag-stack.sh +++ b/ci/export-fdb-version-flag-stack.sh @@ -24,6 +24,12 @@ elif [[ ${FDB_VER} = "6.3.12" ]] then export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-630' elif [[ ${FDB_VER} = "7.1.15" ]] +then + export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-710' +elif [[ ${FDB_VER} = "7.2.7" ]] +then + export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-720' +elif [[ ${FDB_VER} = "7.3.15" ]] then # latest is the default, so no flag is specified export FDB_VER_FLAG='' From 435de69a1dae20c24ccb9e1a725286f421d16045 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:47:49 -0400 Subject: [PATCH 06/20] more oops --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe19c77..b8b8aad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - cabal: ["3.4"] + cabal: ["3.10.1.0"] ghc: - "9.4.6" - "9.6.2" From 7c75962ed1fb1978923513c265c2db99c8197dcf Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 14:57:45 -0400 Subject: [PATCH 07/20] rebaseme, loosen text constraint --- foundationdb-haskell.cabal | 42 ++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/foundationdb-haskell.cabal b/foundationdb-haskell.cabal index 3ed4ae7..14ab4a2 100644 --- a/foundationdb-haskell.cabal +++ b/foundationdb-haskell.cabal @@ -75,42 +75,56 @@ flag with-generate-options flag fdb-version-520 description: Indicates that we are building against version 5.2.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. Manual: True Default: False flag fdb-version-600 description: Indicates that we are building against version 6.0.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. Manual: True Default: False flag fdb-version-610 description: Indicates that we are building against version 6.1.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. Manual: True Default: False flag fdb-version-620 description: Indicates that we are building against version 6.2.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. Manual: True Default: False flag fdb-version-630 description: Indicates that we are building against version 6.3.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. Manual: True Default: False flag fdb-version-700 - description: Indicates that we are building against version 6.3.x of fdb_c.h + description: Indicates that we are building against version 7.0.x of fdb_c.h + Only one of these flags may be specified. If none are specified, + 7.3.x is assumed. + Manual: True + Default: False + +flag fdb-version-710 + description: Indicates that we are building against version 7.1.x of fdb_c.h Only one of these flags may be specified. If none are specified, - 7.1.x is assumed. + 7.3.x is assumed. + Manual: True + Default: False + +flag fdb-version-720 + description: Indicates that we are building against version 7.2.x of fdb_c.h + Only one of these flags may be specified. If none are specified, + 7.3.x is assumed. Manual: True Default: False @@ -156,7 +170,7 @@ library , integer-gmp >= 0.5.1.0 && < 1.2 , mtl >= 2.2.0 && < 2.3 , random >= 1.1 && < 1.3 - , text >= 1.2.3.0 && < 1.3 + , text >= 1.2.3.0 && < 2.1 , deepseq >= 1.4.0.0 && < 1.5 , monad-control >= 1.0.0.0 && < 1.1 , transformers-base >= 0.4.0 && < 0.5 @@ -204,6 +218,12 @@ library if flag(fdb-version-700) CC-Options: -std=c99 -DFDB_API_VERSION=700 CPP-Options: -DFDB_API_VERSION=700 + if flag(fdb-version-710) + CC-Options: -std=c99 -DFDB_API_VERSION=710 + CPP-Options: -DFDB_API_VERSION=710 + if flag(fdb-version-720) + CC-Options: -std=c99 -DFDB_API_VERSION=720 + CPP-Options: -DFDB_API_VERSION=720 executable generate-options if flag(with-generate-options) @@ -264,6 +284,12 @@ test-suite tests if flag(fdb-version-700) CC-Options: -std=c99 -DFDB_API_VERSION=700 CPP-Options: -DFDB_API_VERSION=700 + if flag(fdb-version-710) + CC-Options: -std=c99 -DFDB_API_VERSION=710 + CPP-Options: -DFDB_API_VERSION=710 + if flag(fdb-version-720) + CC-Options: -std=c99 -DFDB_API_VERSION=720 + CPP-Options: -DFDB_API_VERSION=720 benchmark tuple-bench type: exitcode-stdio-1.0 From 45fd05b5e60fbe6b9b3029ee5e41a7d2bfdbbe3a Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:01:16 -0400 Subject: [PATCH 08/20] Force architecture to work around back fdb package --- README.md | 2 +- ci/install-deps.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dac976f..4a1f487 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ I am not using this in a production-like context, but I have exercised the code ### Supported FoundationDB versions -Currently supports 5.2.x through 7.1.x. By default, this package builds assuming that you have installed the latest supported version of FoundationDB. If not, you need to set the appropriate flag when building the library. For example, if you installed FoundationDB 6.0.x, you need to build with +Currently supports 5.2.x through 7.3.x. By default, this package builds assuming that you have installed the latest supported version of FoundationDB. If not, you need to set the appropriate flag when building the library. For example, if you installed FoundationDB 6.0.x, you need to build with `stack build --flag foundationdb-haskell:fdb-version-600` diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 91f1c71..9428660 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -7,8 +7,8 @@ FDB_VER=${1} sudo apt install python2 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb -sudo dpkg -i foundationdb-clients_${FDB_VER}-1_amd64.deb +sudo dpkg --force-architecture -i foundationdb-clients_${FDB_VER}-1_amd64.deb # 6.3.x seems to require us to make this directory sudo mkdir -p /var/lib/foundationdb/data -sudo dpkg -i foundationdb-server_${FDB_VER}-1_amd64.deb +sudo dpkg --force-architecture -i foundationdb-server_${FDB_VER}-1_amd64.deb sudo apt-get install c2hs From 6f50c2cfc4b494d37f5bfba72af7e78192a61ab8 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:02:26 -0400 Subject: [PATCH 09/20] Fix text bounds some more --- foundationdb-haskell.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundationdb-haskell.cabal b/foundationdb-haskell.cabal index 14ab4a2..f220cda 100644 --- a/foundationdb-haskell.cabal +++ b/foundationdb-haskell.cabal @@ -247,7 +247,7 @@ test-suite tests , hspec >= 2.7.8 && < 2.8 , bytestring >= 0.10.8.2 && <0.12 , QuickCheck >= 2.14.2 && < 2.15 - , text >= 1.2.3.0 && < 1.3 + , text >= 1.2.3.0 && < 2.1 , mtl >= 2.2.0 && < 2.3 , deepseq >= 1.4.0.0 && < 1.5 , containers >= 0.5.8.0 && < 0.7 @@ -299,5 +299,5 @@ benchmark tuple-bench , foundationdb-haskell , gauge >= 0.2.5 && < 0.3 , bytestring >= 0.10.8.2 && <0.12 - , text >= 1.2.3.0 && < 1.3 + , text >= 1.2.3.0 && < 2.1 default-language: Haskell2010 From df80c4382ec95b2603fdf1b140a76bdb00b0f6fe Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:07:02 -0400 Subject: [PATCH 10/20] Use apt to install debs --- ci/install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 9428660..e9238de 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -7,8 +7,8 @@ FDB_VER=${1} sudo apt install python2 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb -sudo dpkg --force-architecture -i foundationdb-clients_${FDB_VER}-1_amd64.deb +sudo apt install foundationdb-clients_${FDB_VER}-1_amd64.deb # 6.3.x seems to require us to make this directory sudo mkdir -p /var/lib/foundationdb/data -sudo dpkg --force-architecture -i foundationdb-server_${FDB_VER}-1_amd64.deb +sudo apt install foundationdb-server_${FDB_VER}-1_amd64.deb sudo apt-get install c2hs From eea561039d2372ff39da8b0c55125a3d034c5f9b Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:10:29 -0400 Subject: [PATCH 11/20] oops --- ci/install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index e9238de..022611c 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -7,8 +7,8 @@ FDB_VER=${1} sudo apt install python2 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb -sudo apt install foundationdb-clients_${FDB_VER}-1_amd64.deb +sudo apt install ./foundationdb-clients_${FDB_VER}-1_amd64.deb # 6.3.x seems to require us to make this directory sudo mkdir -p /var/lib/foundationdb/data -sudo apt install foundationdb-server_${FDB_VER}-1_amd64.deb +sudo apt install ./foundationdb-server_${FDB_VER}-1_amd64.deb sudo apt-get install c2hs From 3ae467d2234c7d55b6141ad8e3b972349c50e60e Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:12:17 -0400 Subject: [PATCH 12/20] oops --- ci/install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 022611c..4f087f9 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -7,8 +7,8 @@ FDB_VER=${1} sudo apt install python2 wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb -sudo apt install ./foundationdb-clients_${FDB_VER}-1_amd64.deb +sudo apt install --fix-broken ./foundationdb-clients_${FDB_VER}-1_amd64.deb # 6.3.x seems to require us to make this directory sudo mkdir -p /var/lib/foundationdb/data -sudo apt install ./foundationdb-server_${FDB_VER}-1_amd64.deb +sudo apt install --fix-broken ./foundationdb-server_${FDB_VER}-1_amd64.deb sudo apt-get install c2hs From a8aa65f5bf100c20dce72ebed0a7b0b2b5192b14 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Fri, 25 Aug 2023 15:19:18 -0400 Subject: [PATCH 13/20] More dep fixes --- ci/install-deps.sh | 2 +- foundationdb-haskell.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 4f087f9..8538652 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -4,7 +4,7 @@ set -e FDB_VER=${1} -sudo apt install python2 +sudo apt install python2 libc6 libc6-dev wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb wget https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-server_${FDB_VER}-1_amd64.deb sudo apt install --fix-broken ./foundationdb-clients_${FDB_VER}-1_amd64.deb diff --git a/foundationdb-haskell.cabal b/foundationdb-haskell.cabal index f220cda..bd8a435 100644 --- a/foundationdb-haskell.cabal +++ b/foundationdb-haskell.cabal @@ -244,7 +244,7 @@ test-suite tests build-depends: base >=4.10 && <5 , foundationdb-haskell , async >= 2.2.3 && < 2.3 - , hspec >= 2.7.8 && < 2.8 + , hspec >= 2.7.8 && < 2.12 , bytestring >= 0.10.8.2 && <0.12 , QuickCheck >= 2.14.2 && < 2.15 , text >= 1.2.3.0 && < 2.1 From 5b6429ba6fb173e39820acca98cc9b181b166947 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 14:53:21 -0400 Subject: [PATCH 14/20] Tests print API version --- tests/Properties.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Properties.hs b/tests/Properties.hs index 71c01ca..3d5a46b 100644 --- a/tests/Properties.hs +++ b/tests/Properties.hs @@ -29,6 +29,7 @@ main :: IO () main = do mv <- lookupEnv "FDB_HASKELL_TEST_API_VERSION" :: IO (Maybe String) let version = maybe currentAPIVersion read mv + putStrLn $ "Using API version " ++ show version withFoundationDB defaultOptions {apiVersion = version} $ \db -> do let cleanupAfter tests = hspec $ after_ (cleanup db testSS) tests hspec encodeDecodeSpecs From 675d0403c3d00f019df760bc69164eaf48705eec Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 15:00:02 -0400 Subject: [PATCH 15/20] fix excludes --- .github/workflows/ci.yml | 57 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8b8aad..2b7b4ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,33 +46,42 @@ jobs: # with an older version, but not a newer. This clumsily enforces that # rule. exclude: - - {fdb-version: "7.0.0", fdb-api-version: "710"} - - {fdb-version: "6.3.12", fdb-api-version: "710"} - - {fdb-version: "6.2.20", fdb-api-version: "710"} - - {fdb-version: "6.1.13", fdb-api-version: "710"} - - {fdb-version: "6.1.13", fdb-api-version: "710"} - - {fdb-version: "6.0.18", fdb-api-version: "710"} - - {fdb-version: "6.0.18", fdb-api-version: "710"} - - {fdb-version: "6.0.18", fdb-api-version: "710"} + - {fdb-version: "5.2.8", fdb-api-version: "600"} + - {fdb-version: "5.2.8", fdb-api-version: "610"} + - {fdb-version: "5.2.8", fdb-api-version: "620"} + - {fdb-version: "5.2.8", fdb-api-version: "630"} + - {fdb-version: "5.2.8", fdb-api-version: "700"} - {fdb-version: "5.2.8", fdb-api-version: "710"} - - {fdb-version: "6.3.12", fdb-api-version: "700"} - - {fdb-version: "6.2.20", fdb-api-version: "700"} - - {fdb-version: "6.1.13", fdb-api-version: "700"} - - {fdb-version: "6.1.13", fdb-api-version: "700"} - - {fdb-version: "6.0.18", fdb-api-version: "700"} - - {fdb-version: "6.0.18", fdb-api-version: "700"} + - {fdb-version: "5.2.8", fdb-api-version: "720"} + - {fdb-version: "5.2.8", fdb-api-version: "730"} + - {fdb-version: "6.0.18", fdb-api-version: "610"} + - {fdb-version: "6.0.18", fdb-api-version: "620"} + - {fdb-version: "6.0.18", fdb-api-version: "630"} - {fdb-version: "6.0.18", fdb-api-version: "700"} - - {fdb-version: "5.2.8", fdb-api-version: "700"} - - {fdb-version: "6.2.20", fdb-api-version: "630"} - - {fdb-version: "6.1.13", fdb-api-version: "630"} + - {fdb-version: "6.0.18", fdb-api-version: "710"} + - {fdb-version: "6.0.18", fdb-api-version: "720"} + - {fdb-version: "6.0.18", fdb-api-version: "730"} - {fdb-version: "6.1.13", fdb-api-version: "620"} - - {fdb-version: "6.0.18", fdb-api-version: "630"} - - {fdb-version: "6.0.18", fdb-api-version: "620"} - - {fdb-version: "6.0.18", fdb-api-version: "610"} - - {fdb-version: "5.2.8", fdb-api-version: "630"} - - {fdb-version: "5.2.8", fdb-api-version: "620"} - - {fdb-version: "5.2.8", fdb-api-version: "610"} - - {fdb-version: "5.2.8", fdb-api-version: "600"} + - {fdb-version: "6.1.13", fdb-api-version: "630"} + - {fdb-version: "6.1.13", fdb-api-version: "700"} + - {fdb-version: "6.1.13", fdb-api-version: "710"} + - {fdb-version: "6.1.13", fdb-api-version: "720"} + - {fdb-version: "6.1.13", fdb-api-version: "730"} + - {fdb-version: "6.2.20", fdb-api-version: "630"} + - {fdb-version: "6.2.20", fdb-api-version: "700"} + - {fdb-version: "6.2.20", fdb-api-version: "710"} + - {fdb-version: "6.2.20", fdb-api-version: "720"} + - {fdb-version: "6.2.20", fdb-api-version: "730"} + - {fdb-version: "6.3.12", fdb-api-version: "700"} + - {fdb-version: "6.3.12", fdb-api-version: "710"} + - {fdb-version: "6.3.12", fdb-api-version: "720"} + - {fdb-version: "6.3.12", fdb-api-version: "730"} + - {fdb-version: "7.0.0", fdb-api-version: "710"} + - {fdb-version: "7.0.0", fdb-api-version: "720"} + - {fdb-version: "7.0.0", fdb-api-version: "730"} + - {fdb-version: "7.1.15", fdb-api-version: "720"} + - {fdb-version: "7.1.15", fdb-api-version: "730"} + - {fdb-version: "7.2.7", fdb-api-version: "730"} steps: - uses: actions/checkout@v2 From 1009f308ea1499f9db2da7b0e92ebf0df781d2fd Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 15:42:37 -0400 Subject: [PATCH 16/20] Drop old versions because of ubuntu package renames --- .github/workflows/ci.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b7b4ef..6836ea9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,6 @@ jobs: - "6.3.12" - "6.2.20" - "6.1.13" - - "6.0.18" - - "5.2.8" fdb-api-version: - "520" - "600" @@ -46,21 +44,6 @@ jobs: # with an older version, but not a newer. This clumsily enforces that # rule. exclude: - - {fdb-version: "5.2.8", fdb-api-version: "600"} - - {fdb-version: "5.2.8", fdb-api-version: "610"} - - {fdb-version: "5.2.8", fdb-api-version: "620"} - - {fdb-version: "5.2.8", fdb-api-version: "630"} - - {fdb-version: "5.2.8", fdb-api-version: "700"} - - {fdb-version: "5.2.8", fdb-api-version: "710"} - - {fdb-version: "5.2.8", fdb-api-version: "720"} - - {fdb-version: "5.2.8", fdb-api-version: "730"} - - {fdb-version: "6.0.18", fdb-api-version: "610"} - - {fdb-version: "6.0.18", fdb-api-version: "620"} - - {fdb-version: "6.0.18", fdb-api-version: "630"} - - {fdb-version: "6.0.18", fdb-api-version: "700"} - - {fdb-version: "6.0.18", fdb-api-version: "710"} - - {fdb-version: "6.0.18", fdb-api-version: "720"} - - {fdb-version: "6.0.18", fdb-api-version: "730"} - {fdb-version: "6.1.13", fdb-api-version: "620"} - {fdb-version: "6.1.13", fdb-api-version: "630"} - {fdb-version: "6.1.13", fdb-api-version: "700"} From cc6152834b046f46a75da30ffc8688f3ca4de94f Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 16:14:42 -0400 Subject: [PATCH 17/20] Fix missing case --- ci/export-fdb-version-flag-stack.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/export-fdb-version-flag-stack.sh b/ci/export-fdb-version-flag-stack.sh index 7ce836f..5218de9 100755 --- a/ci/export-fdb-version-flag-stack.sh +++ b/ci/export-fdb-version-flag-stack.sh @@ -23,6 +23,9 @@ then elif [[ ${FDB_VER} = "6.3.12" ]] then export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-630' +elif [[ ${FDB_VER} = "7.0.0" ]] +then + export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-700' elif [[ ${FDB_VER} = "7.1.15" ]] then export FDB_VER_FLAG='--flag foundationdb-haskell:fdb-version-710' From 0e26770469d6749f57ae22c9507ae89401ebfb9d Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 16:21:27 -0400 Subject: [PATCH 18/20] See if older ubuntu helps install 7.2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6836ea9..dabf44f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-20.04] cabal: ["3.10.1.0"] ghc: - "9.4.6" From 573744cd2231f25a619d9aeae0d56376e2cd92fe Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sat, 26 Aug 2023 16:27:24 -0400 Subject: [PATCH 19/20] older ubuntu didn't help --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dabf44f..6836ea9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] cabal: ["3.10.1.0"] ghc: - "9.4.6" From de4a2c6c040a63f3fef032ef2ec62ccb9a8eaa02 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Sun, 12 Nov 2023 13:34:07 -0500 Subject: [PATCH 20/20] Try latest minor versions of 7.2 and 7.3 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6836ea9..b4d3bc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: - "9.4.6" - "9.6.2" fdb-version: - - "7.3.15" - - "7.2.7" + - "7.3.26" + - "7.2.9" - "7.1.15" - "7.0.0" - "6.3.12"