From 12c2241805c3254dc65714fedaaa599601df1f0e Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 27 Jun 2022 18:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-app-mysql8.yml | 2 +- .github/workflows/python-app-php53.yml | 55 ------------------------- plugins/php/versions/72/install.sh | 4 +- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/python-app-php53.yml diff --git a/.github/workflows/python-app-mysql8.yml b/.github/workflows/python-app-mysql8.yml index 0206c4b35..459c48988 100644 --- a/.github/workflows/python-app-mysql8.yml +++ b/.github/workflows/python-app-mysql8.yml @@ -31,7 +31,7 @@ jobs: sudo bash scripts/install_dev.sh - name: Install MySQL80 run: | - SYS_MAKEJN="-j12" + SYS_MAKEJN=-j12 cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 8.0 - name: Start DEBUG run: | diff --git a/.github/workflows/python-app-php53.yml b/.github/workflows/python-app-php53.yml deleted file mode 100644 index ecd1252b4..000000000 --- a/.github/workflows/python-app-php53.yml +++ /dev/null @@ -1,55 +0,0 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: MW APP PHP53 - -on: - push: - branches: [ "master","dev" ] - pull_request: - branches: [ "master","dev" ] - -permissions: - contents: read - -jobs: - build: - strategy: - matrix: - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} - #runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10" - - name: Install MW - run: | - sudo bash scripts/install_dev.sh - - name: Install PHP53 - run: | - SYS_MAKEJN="-j8" - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 53 - - name: Install PHP54 - run: | - SYS_MAKEJN="-j8" - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 54 - - name: Install PHP55 - run: | - SYS_MAKEJN="-j8" - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 55 - - name: Install PHP56 - run: | - SYS_MAKEJN="-j8" - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 56 - - name: Install PHP70 - run: | - SYS_MAKEJN="-j8" - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 70 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index 15be639c1..66cb71f10 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -45,8 +45,8 @@ else fi # 加快测试速度 For Github Action -MAKEJN="${SYS_MAKEJN:-'-j2'}" -echo "SYS_MAKEJN:$MAKEJN" +MAKEJN="${MAKEJN:--j2}" +echo "MAKEJN:$MAKEJN" if [ ! -d $serverPath/php/72 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \