[NO-ISSUE] Prepare 1.0.18

.github/workflows/setup.sh

@@ -3,7 +3,7 @@
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 sudo apt -y update
-sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm
+sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm zlib1g-dev
 
 wget https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb
 sudo dpkg -i ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb

CHANGELOG.md

@@ -5,6 +5,8 @@
 * Add @horizon namespace ([#498](https://github.com/flora-pm/flora-server/issues/498))
 * Signal deprecations and revision dates in version listing page ([#548](https://github.com/flora-pm/flora-server/pull/548))
 * Introduce [changelog-d](https://codeberg.org/fgaz/changelog-d) in the release process.
+* Remove the last @apply from tailwind ([#550](https://github.com/flora-pm/flora-server/pulls/550))
+* Use GHC 9.6.5 and Souffle Datalog 2.2 for development ([#552](https://github.com/flora-pm/flora-server/pull/552))
 
 ## 1.0.17 -- 2024-03-26
 

CONTRIBUTING.md

@@ -75,6 +75,7 @@ Here is the procedure to follow when making a release:
     * Bump the version in the flora.cabal file
     * Generate the changelog with ./scripts/generate-changelog.sh
     * Write down the date in the CHANGELOG
+    * Remove the changelog.d entries
 
 2. Once the PR is merged into `development`, merge `development` into `main`
 3. Create a [new release](https://github.com/flora-pm/flora-server/releases/new).

Dockerfile

@@ -5,8 +5,8 @@ FROM ubuntu@sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6
 ARG GID=1000
 ARG UID=1000
 
-ARG ghc_version=9.6.4
-ARG cabal_version=3.10.2.0
+ARG ghc_version=9.6.5
+ARG cabal_version=3.10.3.0
 
 # generate a working directory
 USER "root"
@@ -49,8 +49,8 @@ ENV PATH="$PATH:/home/$USER/.ghcup/bin"
 
 # install soufflé
 USER "root"
-RUN wget --content-disposition https://github.com/souffle-lang/souffle/releases/download/2.3/x86_64-ubuntu-2004-souffle-2.3-Linux.deb
-RUN apt install -f -y ./x86_64-ubuntu-2004-souffle-2.3-Linux.deb
+RUN wget --content-disposition https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb
+RUN apt install -f -y ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb
 USER ${USER}
 
 RUN echo $PATH
@@ -72,7 +72,7 @@ COPY --chown=${USER} scripts/shell-welcome.txt /etc/motd
 COPY --chown=${USER} scripts/.zshrc /home/$USER/.zshrc
 
 # build Haskell dependencies
-COPY --chown=${USER} cabal.project flora.cabal ./
+COPY --chown=${USER} cabal.project flora.cabal cabal.project.freeze ./
 RUN cabal build --only-dependencies -j
 
 # compile Souffle source files

cabal.project

@@ -1,7 +1,7 @@
 packages:
     ./
 
-with-compiler: ghc-9.6.4
+with-compiler: ghc-9.6.5
 
 active-repositories: hackage.haskell.org
 
@@ -26,6 +26,9 @@ package *
 package warp
   flags: -x509
 
+package zlib
+  flags: -pkg-config
+
 source-repository-package
     type: git
     location: https://github.com/haskell-cryptography/libsodium-bindings