Merge remote-tracking branch 'origin/release-0.43.0'

Author: eikek

.github/workflows/release.yml

@@ -17,16 +17,14 @@ jobs:
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: sbt make-pkg (${{ env.DOCSPELL_VERSION }})
         run: nix develop .#ci --command sbt make-pkg
-      - uses: meeDamian/[email protected]
+      - name: Upload artifacts
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: Docspell ${{ env.DOCSPELL_VERSION }}
-          gzip: false
-          draft: true
-          prerelease: false
-          allow_override: false
-          files: >
-            modules/restserver/target/docspell-restserver_${{ env.DOCSPELL_VERSION }}_all.deb
-            modules/restserver/target/universal/docspell-restserver-${{ env.DOCSPELL_VERSION }}.zip
-            modules/joex/target/docspell-joex_${{ env.DOCSPELL_VERSION }}_all.deb
-            modules/joex/target/universal/docspell-joex-${{ env.DOCSPELL_VERSION }}.zip
+          with:
+            files: |
+              modules/restserver/target/docspell-restserver_${{ env.DOCSPELL_VERSION }}_all.deb
+              modules/restserver/target/universal/docspell-restserver-${{ env.DOCSPELL_VERSION }}.zip
+              modules/joex/target/docspell-joex_${{ env.DOCSPELL_VERSION }}_all.deb
+              modules/joex/target/universal/docspell-joex-${{ env.DOCSPELL_VERSION }}.zip

Changelog.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v0.43.0
+
+*Mar 15, 2025*
+
+### 🐛 Bug Fixes
+
+- Fix scrolling in side bar @eikek (#3002)
+- nix: unpin weasyprint from python310Packages @VTimofeenko (#2981)
+- replaced deprecated  "--optimize-size" with "--optimize-images" @jjkrone (#2972)
+- Correction German Word Dokumene to Dokumente. @andbez (#2941)
+- Fix duplicate task on reboot @tiborrr (#2902)
+- Use http4s' new Part.filename method @pschichtel (#2853)
+- Remove `--optimize-size` option from default weasyprint @eikek (#2784)
+
+### 💚 Maintenance
+
+- Remove docker workflows @eikek (#2956)
+- These things live over at docspell/docker now @pschichtel (#2911)
+- Add metals and bloop to gitignore @tiborrr (#2898)
+- Update .gitignore for vscode users @tiborrr (#2778)
+
+
 ## v0.42.0
 
 *Aug 18, 2024*

modules/joexapi/src/main/resources/joex-openapi.yml

@@ -2,7 +2,7 @@ openapi: 3.0.0
 
 info:
   title: Docspell JOEX
-  version: 0.43.0-SNAPSHOT
+  version: 0.44.0-SNAPSHOT
   description: |
     This is the remote API to the job executor component of Docspell.
     Docspell is a free document management system focused on small

modules/restapi/src/main/resources/docspell-openapi.yml

@@ -2,7 +2,7 @@ openapi: 3.0.0
 
 info:
   title: Docspell
-  version: 0.43.0-SNAPSHOT
+  version: 0.44.0-SNAPSHOT
   description: |
     This is the remote API to Docspell. Docspell is a free document
     management system focused on small groups or families.

nix/pkg.nix

@@ -4,14 +4,14 @@
   fetchzip,
   jdk17,
 }: let
-  version = "0.42.0";
+  version = "0.43.0";
   server = {
     url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
-    sha256 = "sha256-bcT+h1zPqY9Jnx4sbUlE00w9yp6QVZSKddIZtrIK858=";
+    sha256 = "sha256-9qK0WcCbHNc8Z36hc6DXQrWCv3+WuG7+/UIs0Uqv8DA=";
   };
   joex = {
     url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
-    sha256 = "sha256-GkNkUrAcXUVQIJOeeRKUtc5hMoHZqFC1lO8WeMh5tew=";
+    sha256 = "sha256-6BE+QgFkL7FimqwCw68/JAGg8PiERjNF4McV8FTWHMg=";
   };
 in {
   docspell-restserver = stdenv.mkDerivation {

tools/start-local/start-local.sh

@@ -173,16 +173,17 @@ download_zip() {
         echo "Not downloading, files already exist"
     else
         echo "Downloading docspell..."
+        local tag_name="v${ds_version}"
         if [[ $ds_version == *SNAPSHOT ]]; then
-            curl -#Lo "$run_root/pkg/${joex}.zip" "https://github.com/eikek/docspell/releases/download/nightly/docspell-joex-${ds_version}.zip"
-        else
-            curl -#Lo "$run_root/pkg/${joex}.zip" "https://github.com/eikek/docspell/releases/download/v${ds_version}/docspell-joex-${ds_version}.zip"
-        fi
-        if [[ $ds_version == *SNAPSHOT ]]; then
-            curl -#Lo "$run_root/pkg/${restserver}.zip" "https://github.com/eikek/docspell/releases/download/nightly/docspell-restserver-${ds_version}.zip"
-        else
-            curl -#Lo "$run_root/pkg/${restserver}.zip" "https://github.com/eikek/docspell/releases/download/v${ds_version}/docspell-restserver-${ds_version}.zip"
+            tag_name="nightly"
         fi
+        local joex_dl_url="https://github.com/eikek/docspell/releases/download/${tag_name}/docspell-joex-${ds_version}.zip"
+        local rs_dl_url="https://github.com/eikek/docspell/releases/download/${tag_name}/docspell-restserver-${ds_version}.zip"
+
+        echo "--> $joex_dl_url"
+        curl -#Lo "$run_root/pkg/${joex}.zip" "$joex_dl_url"
+        echo "--> $rs_dl_url"
+        curl -#Lo "$run_root/pkg/${restserver}.zip" "$rs_dl_url"
     fi
 
     echo "Unzipping..."

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "0.43.0-SNAPSHOT"
+ThisBuild / version := "0.44.0-SNAPSHOT"

website/elm/GetStarted.elm

@@ -14,16 +14,16 @@ getStarted _ =
         , Markdown.toHtml [ class "my-4 markdown-view " ]
             """1. Clone the github repository
    ```bash
-   $ git clone https://github.com/eikek/docspell
+   $ git clone https://github.com/docspell/docker docspell-docker
    ```
-   Alternatively, [download](https://github.com/eikek/docspell/archive/master.zip) the sources and extract the zip file.
+   Alternatively, [download](https://github.com/docspell/docker/archive/master.zip) the sources and extract the zip file.
 2. Change into the `docker-compose` directory:
    ```bash
-   $ cd docspell/docker/docker-compose
+   $ cd docspell-docker/docker-compose
    ```
 3. Run `docker-compose up`:
    ```bash
-   $ docker-compose up -d
+   $ docker compose up -d
    ```
 4. Goto <http://localhost:7880>, signup and login. When signing up,
    choose the same name for collective and user. Then login

website/site/config.toml

@@ -36,4 +36,4 @@ skip_anchor_prefixes = [
 
 [extra]
 # Put all your custom variables here
-version = "0.43.0-SNAPSHOT"
+version = "0.44.0-SNAPSHOT"

website/site/content/docs/dev/development.md

@@ -292,9 +292,8 @@ is roughly like this:
   doesn't allow to create a release without a tag. So this tag moves
   (and is not really a tag then…). After the prerelease is created,
   the docker images are built and pushed to docker hub into the
-  [docspell](https://hub.docker.com/u/docspell) organization. The
-  docker images are also tagged with `nightly` at docker hub. This is
-  all done via the `realease-nightly.yml` workflow.
+  [docspell](https://github.com/orgs/docspell/packages) organization.
+  This repository will run after a release to build the images.
 - A stable release is started by pushing a tag with pattern `v*` to
   github. This triggers the `release.yml` workflow which builds the
   packages and creates a release in *draft mode*. The `sbt ci` task