Merge tag 'v0.14.0' into release

Release v0.14.0
shaarli · Dec 8, 2024 · 6369729 · 6369729
2 parents 130e347 + 4ce90ec
commit 6369729
Show file tree

Hide file tree

Showing 53 changed files with 3,697 additions and 5,250 deletions.
diff --git a/.dev/.stylelintrc.js b/.dev/.stylelintrc.js
@@ -1,15 +1,13 @@
 module.exports = {
-  extends: 'stylelint-config-standard',
-  plugins: [
-    "stylelint-scss"
-  ],
+  extends: 'stylelint-config-standard-scss',
   rules: {
-    "indentation": [2],
-    "number-leading-zero": null,
     // Replace CSS @ with SASS ones
     "at-rule-no-unknown": null,
     "scss/at-rule-no-unknown": true,
     // not compatible with SASS apparently
+    "color-function-notation": null,
+    "media-feature-range-notation": 'prefix',
+    "shorthand-property-no-redundant-values": null,
     "no-descending-specificity": null
   },
 }
diff --git a/.docker/services.d/php-fpm/run b/.docker/services.d/php-fpm/run
@@ -1,2 +1,2 @@
 #!/bin/execlineb -P
-php-fpm8 -F
+php-fpm82 -F
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         run: sudo apt-get install gettext
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -63,12 +63,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: 18
 
       - name: Yarn install
         run: yarnpkg install
@@ -86,12 +86,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Build documentation
         run: make htmldoc
@@ -100,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run trivy scanner on repository (non-blocking)
         run: make test_trivy_repo TRIVY_EXIT_CODE=0
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
@@ -7,39 +7,42 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        if: github.repository == 'shaarli/Shaarli'
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        if: github.repository == 'shaarli/Shaarli'
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set shaarli version to the latest commit hash
         run: sed -i "s/dev/$(git rev-parse --short HEAD)/" shaarli_version.php
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
-          push: true
+          push: ${{ github.repository == 'shaarli/Shaarli' }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: |
             ${{ secrets.DOCKER_IMAGE }}:latest
             ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
       - name: Run trivy scanner on latest docker image
-        run: make test_trivy_docker TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest
+        if: github.repository == 'shaarli/Shaarli'
+        run: make test_trivy_docker TRIVY_EXIT_CODE=0 TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest
diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Build Docker image
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           push: false
           tags: shaarli/shaarli:pr-${{ github.event.number }}

diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker-tags.yml
@@ -13,17 +13,18 @@ jobs:
       - name: Get the tag name
         run: echo "REF=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
+        if: github.repository == 'shaarli/Shaarli'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
+      - name: Login to GitHub Container Registry
+        if: github.repository == 'shaarli/Shaarli'
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
@@ -32,9 +33,9 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
-          push: true
+          push: ${{ github.repository == 'shaarli/Shaarli' }}
           platforms: linux/amd64,linux/arm/v7
           tags: |
             ${{ secrets.DOCKER_IMAGE }}:${{ env.REF }}

diff --git a/.github/workflows/trivy-release.yml b/.github/workflows/trivy-release.yml
@@ -0,0 +1,25 @@
+name: trivy security scans (release)
+on:
+  schedule:
+    - cron: '0 17 * * *'
+  workflow_dispatch:
+
+jobs:
+  trivy-repo:
+    runs-on: ubuntu-latest
+    name: trivy scan (release composer/yarn dependencies)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Run trivy scanner on repository
+        run: make test_trivy_repo TRIVY_TARGET_BRANCH=origin/release TRIVY_EXIT_CODE=1
+  trivy-docker:
+    runs-on: ubuntu-latest
+    name: trivy scan (release docker image)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run trivy scanner on release docker image
+        run: make test_trivy_docker TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/shaarli/shaarli:release
diff --git a/AUTHORS b/AUTHORS
@@ -1,27 +1,28 @@
-  1216	ArthurHoaro <arthur@hoa.ro>
-   456	nodiscc <nodiscc@gmail.com>
+  1221	ArthurHoaro <arthur@hoa.ro>
+   518	nodiscc <nodiscc@gmail.com>
    405	VirtualTam <virtualtam@flibidi.net>
     56	Sébastien Sauvage <sebsauvage@sebsauvage.net>
-    27	dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-    19	Keith Carangelo <mail@kcaran.com>
+    31	Keith Carangelo <mail@kcaran.com>
+    28	dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
     16	Luce Carević <lcarevic@access42.net>
     15	Florian Eula <eula.florian@gmail.com>
     14	Emilien Klein <emilien@klein.st>
     12	Nicolas Danelon <hi@nicolasmd.com.ar>
      9	Lucas Cimon <lucas.cimon@gmail.com>
      9	Willi Eggeling <thewilli@gmail.com>
      8	Christophe HENRY <christophe.henry@sbgodin.fr>
+     7	kalvn <kalvnthereal@gmail.com>
      6	B. van Berkum <dev@dotmpe.com>
      6	Immánuel Fodor <immanuelfactor+github@gmail.com>
      6	YFdyh000 <yfdyh000@gmail.com>
-     6	kalvn <kalvnthereal@gmail.com>
      6	llune <llune@users.noreply.github.com>
      5	Mark Schmitz <kramred@gmail.com>
      5	Sébastien NOBILI <code@pipoprods.org>
      4	Alexandre Alapetite <alexandre@alapetite.fr>
      4	David Sferruzza <david.sferruzza@gmail.com>
      4	yude <yudesleepy@gmail.com>
      3	Agurato <mail.vmonot@gmail.com>
+     3	Andreas Waschinski <25221082+waschinski@users.noreply.github.com>
      3	Christoph Stoettner <christoph.stoettner@stoeps.de>
      3	Olivier <bourreauolivier@gmail.com>
      3	Teromene <teromene@teromene.fr>
@@ -39,6 +40,7 @@
      2	Miloš Jovanović <mjovanovic@gmail.com>
      2	Neros <contact@neros.fr>
      2	Qwerty <champlywood@free.fr>
+     2	Robert Riebisch <15858666+bttrx@users.noreply.github.com>
      2	Sebastien Wains <sebw@users.noreply.github.com>
      2	Stephen Muth <smuth4@gmail.com>
      2	Timo Van Neerden <fire@lehollandaisvolant.net>
@@ -48,6 +50,7 @@
      2	pips <pips@e5150.fr>
      2	prog-it <pash.vld@gmail.com>
      2	trailjeep <trailjeep@gmail.com>
+     1	7Ds7 <7Ds7@users.noreply.github.com>
      1	Adrien Oliva <adrien.oliva@yapbreak.fr>
      1	Adrien le Maire <adrien@alemaire.be>
      1	Ajabep <ajabep@users.noreply.github.com>
@@ -73,6 +76,7 @@
      1	Franck Kerbiriou <FranckKe@users.noreply.github.com>
      1	Gary Marigliano <gmarigliano93@gmail.com>
      1	Hazhar Galeh <78073762+hazhargaleh@users.noreply.github.com>
+     1	Henschi <to@h6l.de>
      1	Hg <dev@indigo.re>
      1	Jens Kubieziel <github@kubieziel.de>
      1	Jonathan Amiez <jonathan.amiez@gmail.com>
@@ -85,11 +89,14 @@
      1	Loïc Carr <zizou.xena@gmail.com>
      1	Mark Gerarts <mark.gerarts@gmail.com>
      1	Marsup <marsup@gmail.com>
+     1	Martin Puppe <dev@mpuppe.de>
+     1	Mickaël Schoentgen <contact@tiger-222.fr>
      1	Nicolas Friedli <nicolas@theologique.ch>
      1	Nicolas Le Gaillart <nicolas@legaillart.fr>
      1	Paul van den Burg <github@paulvandenburg.nl>
      1	Rajat Hans <rajathans9@gmail.com>
      1	Sbgodin <Sbgodin@users.noreply.github.com>
+     1	Thibaud CANALE <thican@thican.net>
      1	ToM <tom@leloop.org>
      1	TsT <tst2005@gmail.com>
      1	agentcobra <agentcobra@free.fr>
@@ -107,5 +114,6 @@
      1	owen bell <66233223+xfnw@users.noreply.github.com>
      1	philipp <philipp@philipp.PC.Ubuntu>
      1	rfolo9li <50079896+rfolo9li@users.noreply.github.com>
+     1	sokai <sokai@users.noreply.github.com>
      1	sprak3000 <sprak3000+github@gmail.com>
      1	yudejp <i@yude.jp>