diff --git a/.editorconfig b/.editorconfig index 025b8911..3f723948 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false +indent_size = 2 [*.{yml,yaml, vue}] indent_size = 2 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f4f1911f..639a740d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,6 +3,15 @@ name: Bug report about: Build PHP or library failed, download failed, doesn't seem to work... title: '' labels: bug -assignees: crazywhalecc - +body: + - type: textarea + id: what-happened + attributes: + label: What happened? + description: | + Please tell us what you do, what you get and what you expected. + Provide with some step-by-step instructions to reproduce the issue. + If possible, attach a screenshot or log files in ./log directory. + validations: + required: true --- diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 4ead8030..0eb7d1f7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -3,6 +3,6 @@ name: Feature request about: Suggest an idea for this project title: '' labels: new feature -assignees: '' +assignees: crazywhalecc --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f399a043..8accd62f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -206,6 +206,13 @@ jobs: if: ${{ !startsWith(matrix.os, 'windows-') }} run: php src/globals/test-extensions.php build_embed_cmd ${{ matrix.os }} ${{ matrix.php }} + - name: "Upload logs" + if: ${{ always() && hashFiles('log/**') != '' }} + uses: actions/upload-artifact@v4 + with: + name: build-logs-${{ matrix.os }}-${{ matrix.php }} + path: log + # - name: Setup tmate session # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 diff --git a/.gitignore b/.gitignore index ccdb7866..d15edf75 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,12 @@ packlib_files.txt package-lock.json pnpm-lock.yaml -# craft.log -craft.log +# craft craft.yml + +# SPC logs +log/ + +# spc.phar +spc.phar +spc.exe diff --git a/docs/en/guide/manual-build.md b/docs/en/guide/manual-build.md index e9afaa4c..2b00358e 100644 --- a/docs/en/guide/manual-build.md +++ b/docs/en/guide/manual-build.md @@ -172,7 +172,7 @@ If the build is successful, you will see the `buildroot/bin` directory in the cu If the build fails, you can use the `--debug` parameter to view detailed error information, or use the `--with-clean` to clear the old compilation results and recompile. -If the build still fails to use the above method, please submit an issue and attach your `craft.yml` and `craft.log`. +If the build still fails to use the above method, please submit an issue and attach your `craft.yml` and `./log` archive. ## Step-by-step build command diff --git a/docs/zh/guide/manual-build.md b/docs/zh/guide/manual-build.md index dcc9d255..b7291e85 100644 --- a/docs/zh/guide/manual-build.md +++ b/docs/zh/guide/manual-build.md @@ -149,7 +149,7 @@ bin/spc craft --debug 如果中途构建出错,你可以使用 `--debug` 参数查看详细的错误信息,或者使用 `--with-clean` 参数清除旧的编译结果,重新编译。 -如使用以上方式仍构建失败,请提交一个 issue,附上你的 `craft.yml`、`craft.log`。 +如使用以上方式仍构建失败,请提交一个 issue,附上你的 `craft.yml` 文件、`log/` 目录的压缩包。 ## 分步构建命令 diff --git a/phpstan.neon b/phpstan.neon index 1fcd78e5..78b72c76 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,6 +8,7 @@ parameters: - '#class Fiber#' - '#Attribute class JetBrains\\PhpStorm\\ArrayShape does not exist#' - '#Function Swoole\\Coroutine\\run not found.#' + - '#Static call to instance method ZM\\Logger\\ConsoleColor#' dynamicConstantNames: - PHP_OS_FAMILY excludePaths: