.github/workflows/build-docker.yml

@@ -1,9 +1,16 @@
 name: Build docker image
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
-  release:
-    types:
-      - published
+  push:
+    branches:
+      - master
+      - 6.x
+    tags:
+      - '*'
 
 permissions:
   contents: read
@@ -19,11 +26,10 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5.3.1
         with:
-          concurrent_skipping: always
           cancel_others: true
           do_not_skip: '["release"]'
           # list files that may affect or are included into the built phar
-          paths: '["bin/**", "assets/**", "build/**", "dictionaries/**", "src/**", "stubs/**", "psalm", "psalm-language-server", "psalm-plugin", "psalm-refactor", "psalm-review", "psalter", "box.json.dist", "composer.json", "config.xsd", "keys.asc.gpg", "scoper.inc.php"]'
+          paths: '[".github/**", "bin/**", "assets/**", "build/**", "dictionaries/**", "src/**", "stubs/**", "psalm", "psalm-language-server", "psalm-plugin", "psalm-refactor", "psalm-review", "psalter", "box.json.dist", "composer.json", "config.xsd", "keys.asc.gpg", "scoper.inc.php"]'
 
   build-docker:
     permissions:
@@ -119,4 +125,4 @@ jobs:
           ACTOR: ${{ github.repository_owner }}
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-          php bin/ci/push-docker.php
+          php bin/ci/push-docker.php

bin/ci/build-docker.php

@@ -10,8 +10,8 @@
 
 $commit = getenv('GITHUB_SHA');
 $user = getenv('ACTOR');
-$ref = substr(getenv('REF'), strlen('refs/heads/'));
-$is_tag = getenv('EVENT_NAME') === 'release';
+$is_tag = str_starts_with(getenv('REF'), 'refs/tags/');
+$ref = str_replace(['refs/heads/', 'refs/tags/'], '', getenv('REF'));
 
 echo "Waiting for commit $commit on $ref...".PHP_EOL;
 

bin/ci/push-docker.php

@@ -13,18 +13,18 @@ function r(string $cmd): void
 }
 
 $user = getenv('ACTOR');
-$ref = substr(getenv('REF'), strlen('refs/heads/'));
-$is_tag = getenv('EVENT_NAME') === 'release';
+$is_tag = str_starts_with(getenv('REF'), 'refs/tags/');
+$ref = str_replace(['refs/heads/', 'refs/tags/'], '', getenv('REF'));
 
 $ref = escapeshellarg($ref);
 
 r("docker pull ghcr.io/$user/psalm:$ref-arm64 --platform arm64");
 r("docker pull ghcr.io/$user/psalm:$ref-amd64 --platform amd64");
 
 r("docker buildx imagetools create -t ghcr.io/$user/psalm:$ref ghcr.io/$user/psalm:$ref-arm64 ghcr.io/$user/psalm:$ref-amd64");
-r("docker pull ghcr.io/$user/psalm:$ref");
 
 if ($is_tag) {
+    r("docker pull ghcr.io/$user/psalm:$ref");
     r("docker tag ghcr.io/$user/psalm:$ref ghcr.io/$user/psalm:latest");
     r("docker push ghcr.io/$user/psalm:latest");
 }

docs/running_psalm/installation.md

@@ -30,7 +30,7 @@ It is recommended to run Psalm in the official docker image: it uses a custom bu
 docker run -v $PWD:/app --rm -it ghcr.io/danog/psalm:latest /composer/vendor/bin/psalm --no-cache
 ```
 
-More specific tags are also available (i.e. `ghcr.io/danog/psalm:6.9.0`).   
+More specific tags are also available (i.e. `ghcr.io/danog/psalm:6.9.1`, as well as branch tags).   
 
 Issues due to missing extensions can be fixed by enabling them in psalm.xml and/or requiring them in composer.json [see here »](https://psalm.dev/docs/running_psalm/configuration/#enableextensions) for more info.