From d7250ebde5d4e29d60e8144e1f375dcd9acaca39 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 27 Jun 2022 17:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95php53=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-app-mysql8.yml | 38 ------------------------- .github/workflows/python-app-op.yml | 38 ------------------------- .github/workflows/python-app-php53.yml | 1 + .github/workflows/python-app-php54.yml | 38 ------------------------- .github/workflows/python-app-php55.yml | 38 ------------------------- .github/workflows/python-app-php56.yml | 38 ------------------------- .github/workflows/python-app-php70.yml | 38 ------------------------- .github/workflows/python-app-php71.yml | 38 ------------------------- .github/workflows/python-app-php72.yml | 38 ------------------------- .github/workflows/python-app-php73.yml | 38 ------------------------- .github/workflows/python-app-php74.yml | 38 ------------------------- .github/workflows/python-app-php80.yml | 38 ------------------------- .github/workflows/python-app-php81.yml | 38 ------------------------- .github/workflows/python-app.yml | 36 ----------------------- .github/workflows/python3.6.8-app.yml | 36 ----------------------- plugins/php/versions/53/install.sh | 6 +++- 16 files changed, 6 insertions(+), 529 deletions(-) delete mode 100644 .github/workflows/python-app-mysql8.yml delete mode 100644 .github/workflows/python-app-op.yml delete mode 100644 .github/workflows/python-app-php54.yml delete mode 100644 .github/workflows/python-app-php55.yml delete mode 100644 .github/workflows/python-app-php56.yml delete mode 100644 .github/workflows/python-app-php70.yml delete mode 100644 .github/workflows/python-app-php71.yml delete mode 100644 .github/workflows/python-app-php72.yml delete mode 100644 .github/workflows/python-app-php73.yml delete mode 100644 .github/workflows/python-app-php74.yml delete mode 100644 .github/workflows/python-app-php80.yml delete mode 100644 .github/workflows/python-app-php81.yml delete mode 100644 .github/workflows/python-app.yml delete mode 100644 .github/workflows/python3.6.8-app.yml diff --git a/.github/workflows/python-app-mysql8.yml b/.github/workflows/python-app-mysql8.yml deleted file mode 100644 index ee6de9d72..000000000 --- a/.github/workflows/python-app-mysql8.yml +++ /dev/null @@ -1,38 +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 MySQL80 - -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 MySQL80 - run: | - cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 8.0 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml deleted file mode 100644 index 6d75ab849..000000000 --- a/.github/workflows/python-app-op.yml +++ /dev/null @@ -1,38 +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 OpenResty - -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 OpenResty - run: | - cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.21.4.1 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php53.yml b/.github/workflows/python-app-php53.yml index 910c54ffb..325f6b890 100644 --- a/.github/workflows/python-app-php53.yml +++ b/.github/workflows/python-app-php53.yml @@ -31,6 +31,7 @@ jobs: sudo bash scripts/install_dev.sh - name: Install PHP53 run: | + SYS_MAKEJN="-j4" cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 53 - name: Start DEBUG run: | diff --git a/.github/workflows/python-app-php54.yml b/.github/workflows/python-app-php54.yml deleted file mode 100644 index e646cd6ed..000000000 --- a/.github/workflows/python-app-php54.yml +++ /dev/null @@ -1,38 +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 PHP54 - -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 PHP54 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 54 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php55.yml b/.github/workflows/python-app-php55.yml deleted file mode 100644 index 766394a02..000000000 --- a/.github/workflows/python-app-php55.yml +++ /dev/null @@ -1,38 +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 PHP55 - -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 PHP55 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 55 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php56.yml b/.github/workflows/python-app-php56.yml deleted file mode 100644 index 81f279992..000000000 --- a/.github/workflows/python-app-php56.yml +++ /dev/null @@ -1,38 +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 PHP56 - -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 PHP56 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 56 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php70.yml b/.github/workflows/python-app-php70.yml deleted file mode 100644 index b2ce28b36..000000000 --- a/.github/workflows/python-app-php70.yml +++ /dev/null @@ -1,38 +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 PHP70 - -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 PHP70 - run: | - 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/.github/workflows/python-app-php71.yml b/.github/workflows/python-app-php71.yml deleted file mode 100644 index 069e7c545..000000000 --- a/.github/workflows/python-app-php71.yml +++ /dev/null @@ -1,38 +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 PHP71 - -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 PHP71 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 71 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php72.yml b/.github/workflows/python-app-php72.yml deleted file mode 100644 index b57cf915d..000000000 --- a/.github/workflows/python-app-php72.yml +++ /dev/null @@ -1,38 +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 PHP72 - -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 PHP72 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 72 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php73.yml b/.github/workflows/python-app-php73.yml deleted file mode 100644 index 5eedf1129..000000000 --- a/.github/workflows/python-app-php73.yml +++ /dev/null @@ -1,38 +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 PHP73 - -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 PHP73 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 73 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php74.yml b/.github/workflows/python-app-php74.yml deleted file mode 100644 index 97167208d..000000000 --- a/.github/workflows/python-app-php74.yml +++ /dev/null @@ -1,38 +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 PHP74 - -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 PHP74 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 74 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php80.yml b/.github/workflows/python-app-php80.yml deleted file mode 100644 index c8b926ce6..000000000 --- a/.github/workflows/python-app-php80.yml +++ /dev/null @@ -1,38 +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 PHP80 - -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 PHP80 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 80 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app-php81.yml b/.github/workflows/python-app-php81.yml deleted file mode 100644 index 5a08cdd39..000000000 --- a/.github/workflows/python-app-php81.yml +++ /dev/null @@ -1,38 +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 PHP81 - -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 PHP81 - run: | - cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 81 - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml deleted file mode 100644 index 128922c21..000000000 --- a/.github/workflows/python-app.yml +++ /dev/null @@ -1,36 +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 - -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 dependencies - run: | - python -m pip install --upgrade pip - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/.github/workflows/python3.6.8-app.yml b/.github/workflows/python3.6.8-app.yml deleted file mode 100644 index 9bd9ff2c0..000000000 --- a/.github/workflows/python3.6.8-app.yml +++ /dev/null @@ -1,36 +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 3.6.8 - -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.6.8 - uses: actions/setup-python@v3 - with: - python-version: "3.6.8" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi - - name: Start DEBUG - run: | - gunicorn -c setting.py app:app - python3 task.py & diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 8e702337e..27c275c0b 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -52,6 +52,10 @@ else fi +# 加快测试速度 For Github Action +MAKEJN='${SYS_MAKEJN:+"-j1"}' +echo "SYS_MAKEJN:$MAKEJN" + if [ ! -d $serverPath/php/53 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ --prefix=$serverPath/php/53 \ @@ -85,7 +89,7 @@ if [ ! -d $serverPath/php/53 ];then --disable-fileinfo \ $OPTIONS \ --enable-fpm - make clean && make && make install && make clean + make clean && make $MAKEJN && make install && make clean fi