Merge commit 'refs/pull/475/head' of github.com:alchemy-fr/phraseanet…

…-services into w2445
alchemy-fr · Nov 8, 2024 · 46db2f3 · 46db2f3
2 parents ac2c103 + 3ad683f
commit 46db2f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,11 +30,11 @@ jobs:
     if: ${{ github.repository_owner == 'alchemy-fr' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 30
 
-      - name: Get git log
+      - name: Generate git log
         if: "${{ inputs.image == 'dashboard' }}"
         run: bin/git-log.sh
 

diff --git a/bin/build.sh b/bin/build.sh
@@ -6,7 +6,7 @@ set -e
 
 load-env
 
-. "bin/git-log.sh"
+bin/git-log.sh
 
 docker compose -f docker-compose.init.yml build $@
 docker compose build $@
diff --git a/dashboard/client/.gitignore b/dashboard/client/.gitignore
@@ -27,6 +27,7 @@ logs
 *.log
 pnpm-debug.log*
 lerna-debug.log*
+git-log.html
 
 node_modules
 dist