Skip to content

Commit e15538e

Browse files
committed
Merge branch 'experiment-feature' into build_native_php
2 parents d9aaa21 + bfcf8ce commit e15538e

4 files changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/linux-aarch64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ jobs:
126126
alias php="php -d curl.cainfo=/work/runtime/php/cacert.pem -d openssl.cafile=/work/runtime/php/cacert.pem"
127127
128128
sh sapi/quickstart/linux/alpine-init.sh
129+
git config --global --add safe.directory /work
129130
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
130131
composer dump-autoload --optimize --profile --no-dev
131132

.github/workflows/linux-x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ jobs:
179179
alias php="php -d curl.cainfo=/work/runtime/php/cacert.pem -d openssl.cafile=/work/runtime/php/cacert.pem"
180180
181181
sh sapi/quickstart/linux/alpine-init.sh
182+
git config --global --add safe.directory /work
182183
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
183184
composer dump-autoload --optimize --profile --no-dev
184185

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,6 @@ php.ini
335335
sapi/webUI/deploy.sh
336336
sapi/webUI/public/data/
337337
Makefile.backup
338-
ldflags.log
339-
cppflags.log
340338
libs.log
341339
ext/apcu/
342340
ext/ssh2/
@@ -352,3 +350,5 @@ php-fpm-*
352350
*.deb
353351
*.rpm
354352
nfpm-pkg.yaml
353+
!/var/.gitkeep
354+

sapi/scripts/tencent-cloud-object-storage.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,28 @@ if [ "${UPLOAD_TYPE}" == 'all' ]; then
136136
SWOOLE_VERSION=$(echo ${SWOOLE_CLI_VERSION} | awk -F '.' '{ printf "%s.%s.%s" ,$1,$2,$3 }')
137137
cd ${__PROJECT__}/var/artifact-hash/${SWOOLE_CLI_VERSION}
138138
{
139-
${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
140-
${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
141-
${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
142-
${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
143-
${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
139+
${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
140+
${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
141+
${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
142+
${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
143+
${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
144144
status=$?
145145
} || {
146146
status=$?
147147
}
148148
if [[ $status -ne 0 ]]; then
149149
echo $status
150-
cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
151150
exit 1
152151
fi
153152
cd ${__PROJECT__}
154153
exit 0
155154
fi
156155

157156
if [ "${UPLOAD_TYPE}" == 'single' ]; then
158-
${COSCLI} cp --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
157+
${COSCLI} cp ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
159158
status=$?
160159
if [[ $status -ne 0 ]]; then
161160
echo $status
162-
cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
163161
exit 1
164162
fi
165163
exit 0
@@ -172,7 +170,6 @@ if [ "${UPLOAD_TYPE}" == 'show' ]; then
172170
status=$?
173171
if [[ $status -ne 0 ]]; then
174172
echo $status
175-
cat ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log
176173
exit 1
177174
fi
178175
exit 0

0 commit comments

Comments
 (0)