Skip to content

Commit 8649068

Browse files
authored
Merge branch 'main' into frankenphp/mbed
2 parents 4d35011 + 5476385 commit 8649068

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1828
-1369
lines changed

.github/workflows/build-unix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ jobs:
136136
macos-x86_64)
137137
DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
138138
BUILD_CMD="./bin/spc build"
139-
RUNS_ON="macos-13"
139+
RUNS_ON="macos-15-intel"
140140
;;
141141
macos-aarch64)
142142
DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
143143
BUILD_CMD="./bin/spc build"
144-
RUNS_ON="macos-14"
144+
RUNS_ON="macos-15"
145145
;;
146146
esac
147147
DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"

.github/workflows/ext-matrix-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ jobs:
8585
- "8.4"
8686
operating-system:
8787
- "ubuntu-latest"
88-
#- "macos-13"
88+
#- "macos-15-intel"
8989
#- "debian-arm64-self-hosted"
90-
- "macos-14"
90+
- "macos-15"
9191

9292
steps:
9393
- name: "Checkout"
@@ -99,11 +99,11 @@ jobs:
9999
OS=""
100100
if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then
101101
OS="linux-x86_64"
102-
elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then
102+
elif [ "${{ matrix.operating-system }}" = "macos-15-intel" ]; then
103103
OS="macos-x86_64"
104104
elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then
105105
OS="linux-aarch64"
106-
elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
106+
elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then
107107
OS="macos-aarch64"
108108
fi
109109
echo "OS=$OS" >> $GITHUB_ENV

.github/workflows/release-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
os: "ubuntu-latest"
2828
filename: "spc-linux-x86_64.tar.gz"
2929
- name: "macos-x86_64"
30-
os: "macos-13"
30+
os: "macos-15-intel"
3131
filename: "spc-macos-x86_64.tar.gz"
3232
- name: "linux-aarch64"
3333
os: "ubuntu-latest"
@@ -147,11 +147,11 @@ jobs:
147147
- name: "linux-x86_64"
148148
os: "ubuntu-latest"
149149
- name: "macos-x86_64"
150-
os: "macos-13"
150+
os: "macos-15-intel"
151151
- name: "linux-aarch64"
152152
os: "ubuntu-24.04-arm"
153153
- name: "macos-aarch64"
154-
os: "macos-latest"
154+
os: "macos-15"
155155
- name: "windows-x64"
156156
os: "windows-latest"
157157
steps:

.github/workflows/tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
name: Tests
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- 'src/globals/test-extensions.php'
94
pull_request:
105
branches: [ "main" ]
6+
types: [ opened, synchronize, reopened ]
117
paths:
128
- 'src/**'
139
- 'config/**'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ docker/source/
2222
# default package root directory
2323
/pkgroot/**
2424

25+
# Windows PHP SDK binary tools
26+
/php-sdk-binary-tools/**
27+
2528
# default pack:lib and release directory
2629
/dist/**
2730
packlib_files.txt

README-zh.md

Lines changed: 94 additions & 236 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 69 additions & 242 deletions
Large diffs are not rendered by default.

bin/spc-alpine-docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
150150
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
151151
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
152152
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
153+
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/log:/app/log"
153154
if [ -f "$(pwd)/craft.yml" ]; then
154155
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
155156
fi

bin/spc-gnu-docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
158158
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
159159
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
160160
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
161+
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/log:/app/log"
161162
if [ -f "$(pwd)/craft.yml" ]; then
162163
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
163164
fi

0 commit comments

Comments
 (0)