Skip to content

Commit ad4b7b6

Browse files
committed
Merge branch '6.x'
2 parents a26475c + cf42094 commit ad4b7b6

File tree

12 files changed

+1502
-3190
lines changed

12 files changed

+1502
-3190
lines changed

.github/workflows/build-stubs.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ concurrency:
55
cancel-in-progress: true
66

77
on:
8-
push:
9-
branches:
10-
- master
11-
- 6.x
8+
release:
9+
types:
10+
- published
1211

1312
permissions:
1413
contents: read
@@ -26,7 +25,6 @@ jobs:
2625
with:
2726
cancel_others: true
2827
do_not_skip: '["release"]'
29-
paths: '[".github/**", "bin/**"]'
3028

3129
build-stubs-docker:
3230
permissions:

bin/stubs/build_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ VERSIONS="7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4"
44

55
for f in $VERSIONS; do
66
{
7-
docker buildx build --push --cache-to type=inline --cache-from type=registry,ref=ghcr.io/$ACTOR/psalm:internal_stubs_$f --build-arg VERSION=$f . -f bin/stubs/Dockerfile_$f -t ghcr.io/$ACTOR/psalm:internal_stubs_$f
7+
docker buildx build --push --build-arg VERSION=$f . -f bin/stubs/Dockerfile_$f -t ghcr.io/$ACTOR/psalm:internal_stubs_$f
88
} &
99
if [ "$f" == "7.1" ] || [ "$f" == "7.3" ] || [ "$f" == "8.0" ] || [ "$f" == "8.2" ] || [ "$f" == "8.4" ]; then wait; fi
1010
done
1111

12-
wait
12+
wait

0 commit comments

Comments
 (0)