From ef8651aaa5f1eaeb5065c4cd35d26ef6d569e8f4 Mon Sep 17 00:00:00 2001 From: jbarritaud Date: Mon, 31 Jul 2023 16:35:26 +0200 Subject: [PATCH 01/24] Create main.yml --- .github/workflows/main.yml | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..7219319 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,41 @@ +name: Quanta PHP Module builder + +on: + push: + branches: + - 'master' + pull_request: + branches: + - '**' + types: + - opened + - edited + - synchronize + - labeled + + workflow_dispatch: + +permissions: + id-token: write + contents: read + +env: + PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +jobs: + + build_php_module: + if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + environment: build + name: 'QM3K PHP Module build' + runs-on: ubuntu-latest + + steps: + - name: Clone quanta-php-module repository + uses: actions/checkout@v3 + + - name: Clone Buildozer repository + uses: actions/checkout@v3 + with: + repository: quanta-computing/buildozer + persist-credentials: true From 8336f3999edd2b9970d43ae641d0db4e72c97115 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Mon, 31 Jul 2023 16:42:17 +0200 Subject: [PATCH 02/24] add branch --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7219319..c48a0c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,4 +38,4 @@ jobs: uses: actions/checkout@v3 with: repository: quanta-computing/buildozer - persist-credentials: true + ref: 'master' From 797e3a5950c4a3710209cf2b163d1489ae539a02 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Mon, 31 Jul 2023 17:41:12 +0200 Subject: [PATCH 03/24] add key for buildozer and list files --- .github/workflows/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c48a0c4..4b5f602 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,11 +31,15 @@ jobs: runs-on: ubuntu-latest steps: - - name: Clone quanta-php-module repository - uses: actions/checkout@v3 + - name: List files + run: ls -lRa . - name: Clone Buildozer repository uses: actions/checkout@v3 with: + ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer - ref: 'master' + persist-credentials: true + + - name: List files again + run: ls -lRa . From e46221996b65e46dceb8d32098c1508cfd2b2524 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Mon, 31 Jul 2023 17:43:22 +0200 Subject: [PATCH 04/24] add current repo checkout --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b5f602..59271fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,12 +34,18 @@ jobs: - name: List files run: ls -lRa . + - name: Clone Quanta PHP Module repository + uses: actions/checkout@v3 + with: + path: php-module + - name: Clone Buildozer repository uses: actions/checkout@v3 with: ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer persist-credentials: true + path: buildozer - name: List files again run: ls -lRa . From 5db86f4f877d459960f6cc0a23e63eb55596fc91 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:14:09 +0200 Subject: [PATCH 05/24] try to run buildozer first time --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 59271fe..fd52b52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,10 @@ jobs: ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer persist-credentials: true - path: buildozer + path: buildozer-repo + + - name: Build the PHP package + run: ./buildozer-repo/buildozer -t php56-quanta-mon -o debian -v jessie -s ./php-module/ -r php56 - name: List files again run: ls -lRa . From ccdfeac041799c657c2f34d9a47b1e7e543b925f Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:17:26 +0200 Subject: [PATCH 06/24] try fixing erroring path --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd52b52..6b90bc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,9 @@ jobs: path: buildozer-repo - name: Build the PHP package - run: ./buildozer-repo/buildozer -t php56-quanta-mon -o debian -v jessie -s ./php-module/ -r php56 + run: | + cd buildozer-repo + ./buildozer -t php56-quanta-mon -o debian -v jessie -s /php-module/ -r php56 - name: List files again run: ls -lRa . From 4059203dae931cccf6fd482f222ab06ea49ce3d1 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:19:37 +0200 Subject: [PATCH 07/24] fix buildozer using path --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b90bc3..c662afc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,10 +47,17 @@ jobs: persist-credentials: true path: buildozer-repo + - name: List files again + run: ls -lRa . + + - name: Build the PHP package run: | cd buildozer-repo - ./buildozer -t php56-quanta-mon -o debian -v jessie -s /php-module/ -r php56 + ls -l + pwd + ls -l ../ + ./buildozer -t php56-quanta-mon -o debian -v jessie -s ../php-module/ -r php56 - name: List files again run: ls -lRa . From 937fbd3c07b20e8aed82ba7a37f1e63a5318b0cf Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:22:24 +0200 Subject: [PATCH 08/24] try with buster and recent php version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c662afc..30fce04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,7 +57,7 @@ jobs: ls -l pwd ls -l ../ - ./buildozer -t php56-quanta-mon -o debian -v jessie -s ../php-module/ -r php56 + ./buildozer -t php74-quanta-mon -o debian -v buster -s ../php-module/ -r php74-buster - name: List files again run: ls -lRa . From 6ea9d5d47c99ed5a63cfe43577ab294db4404542 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:32:10 +0200 Subject: [PATCH 09/24] remove debug and rebuild from / --- .github/workflows/main.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30fce04..7327f87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,13 +31,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: List files - run: ls -lRa . - - name: Clone Quanta PHP Module repository uses: actions/checkout@v3 - with: - path: php-module - name: Clone Buildozer repository uses: actions/checkout@v3 @@ -45,19 +40,13 @@ jobs: ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer persist-credentials: true - path: buildozer-repo - name: List files again run: ls -lRa . - - name: Build the PHP package run: | - cd buildozer-repo - ls -l - pwd - ls -l ../ - ./buildozer -t php74-quanta-mon -o debian -v buster -s ../php-module/ -r php74-buster + ./buildozer -t php74-quanta-mon -o debian -v buster -s . -r debian-buster - name: List files again run: ls -lRa . From a7907c1d686de638c21dae449c3cad8023b2441f Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:38:54 +0200 Subject: [PATCH 10/24] finnaly understanding the pathing --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7327f87..68e9c0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,8 @@ jobs: steps: - name: Clone Quanta PHP Module repository uses: actions/checkout@v3 + with: + path: php-module - name: Clone Buildozer repository uses: actions/checkout@v3 @@ -46,7 +48,7 @@ jobs: - name: Build the PHP package run: | - ./buildozer -t php74-quanta-mon -o debian -v buster -s . -r debian-buster + ./buildozer -t php74-quanta-mon -o debian -v buster -s ./php-module/extension -r debian-buster - name: List files again run: ls -lRa . From 840598ea45c15e379fbd892bdb457a7dae53f5db Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:42:24 +0200 Subject: [PATCH 11/24] finnaly understanding the pathing 2 --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68e9c0a..8e0a606 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,8 +33,6 @@ jobs: steps: - name: Clone Quanta PHP Module repository uses: actions/checkout@v3 - with: - path: php-module - name: Clone Buildozer repository uses: actions/checkout@v3 From db29ac95531c033b73c09f70c482a48ebe4c5622 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:45:51 +0200 Subject: [PATCH 12/24] try to resplit directory because home is overriding itself --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e0a606..f57b2b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,8 @@ jobs: steps: - name: Clone Quanta PHP Module repository uses: actions/checkout@v3 + with: + path: php-module - name: Clone Buildozer repository uses: actions/checkout@v3 @@ -40,13 +42,15 @@ jobs: ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer persist-credentials: true + path: tools - name: List files again run: ls -lRa . - name: Build the PHP package run: | - ./buildozer -t php74-quanta-mon -o debian -v buster -s ./php-module/extension -r debian-buster + cd tools + ./buildozer -t php74-quanta-mon -o debian -v buster -s ../php-module/extension/ -r debian-buster - name: List files again run: ls -lRa . From 347e8d8ef2bf1046a76f2904197e753a72d3499d Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Tue, 1 Aug 2023 17:54:05 +0200 Subject: [PATCH 13/24] try double build with 2 version --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f57b2b2..5f48233 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,10 @@ env: PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - - build_php_module: + debian-buster-php73: if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') environment: build - name: 'QM3K PHP Module build' + name: 'PHP 7.3 for Debian Buster' runs-on: ubuntu-latest steps: @@ -44,13 +43,32 @@ jobs: persist-credentials: true path: tools - - name: List files again - run: ls -lRa . + - name: Build the PHP package + run: | + cd tools + ./buildozer -t php73-quanta-mon -o debian -v buster -s ../php-module/extension/ -r debian-buster + + debian-buster-php74: + if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + environment: build + name: 'PHP 7.4 for Debian Buster' + runs-on: ubuntu-latest + + steps: + - name: Clone Quanta PHP Module repository + uses: actions/checkout@v3 + with: + path: php-module + + - name: Clone Buildozer repository + uses: actions/checkout@v3 + with: + ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} + repository: quanta-computing/buildozer + persist-credentials: true + path: tools - name: Build the PHP package run: | cd tools ./buildozer -t php74-quanta-mon -o debian -v buster -s ../php-module/extension/ -r debian-buster - - - name: List files again - run: ls -lRa . From 766cb5e002d1e793e61903decac4ed4a28686ac5 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 09:36:44 +0200 Subject: [PATCH 14/24] try matrix to build multiple image --- .github/workflows/main.yml | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f48233..d2ad700 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,15 @@ env: PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - debian-buster-php73: + debian-builds: if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') environment: build - name: 'PHP 7.3 for Debian Buster' + name: 'PHP 7.3, 7.4 for debian jessie, stretch, buster' runs-on: ubuntu-latest + strategy: + matrix: + php-version: [php73, php74] #php72, php80, php81, php82 + debian-version: [jessie, stretch, buster] #bullseye, bookworm steps: - name: Clone Quanta PHP Module repository @@ -46,29 +50,4 @@ jobs: - name: Build the PHP package run: | cd tools - ./buildozer -t php73-quanta-mon -o debian -v buster -s ../php-module/extension/ -r debian-buster - - debian-buster-php74: - if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') - environment: build - name: 'PHP 7.4 for Debian Buster' - runs-on: ubuntu-latest - - steps: - - name: Clone Quanta PHP Module repository - uses: actions/checkout@v3 - with: - path: php-module - - - name: Clone Buildozer repository - uses: actions/checkout@v3 - with: - ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} - repository: quanta-computing/buildozer - persist-credentials: true - path: tools - - - name: Build the PHP package - run: | - cd tools - ./buildozer -t php74-quanta-mon -o debian -v buster -s ../php-module/extension/ -r debian-buster + ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r debian-${{ matrix.debian-version }} From 4b27c55a5bc4826248eb6ea41c67723b68504469 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 09:37:37 +0200 Subject: [PATCH 15/24] fix indentation --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2ad700..65c836d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,9 +29,9 @@ jobs: name: 'PHP 7.3, 7.4 for debian jessie, stretch, buster' runs-on: ubuntu-latest strategy: - matrix: - php-version: [php73, php74] #php72, php80, php81, php82 - debian-version: [jessie, stretch, buster] #bullseye, bookworm + matrix: + php-version: [php73, php74] #php72, php80, php81, php82 + debian-version: [jessie, stretch, buster] #bullseye, bookworm steps: - name: Clone Quanta PHP Module repository From 76ddf0d540dfd0b378bb58ec75f50f3728b141bd Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 09:39:40 +0200 Subject: [PATCH 16/24] try matrixing also the description --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65c836d..497b780 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: debian-builds: if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') environment: build - name: 'PHP 7.3, 7.4 for debian jessie, stretch, buster' + name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' runs-on: ubuntu-latest strategy: matrix: From 1ac7bdb7970e03986897628ed9a5c3161046359f Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 09:44:14 +0200 Subject: [PATCH 17/24] remove the fail-fast default strategy because we want to build as much as package as posisble --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 497b780..dd78cc7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,7 @@ jobs: name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' runs-on: ubuntu-latest strategy: + fail-fast: false matrix: php-version: [php73, php74] #php72, php80, php81, php82 debian-version: [jessie, stretch, buster] #bullseye, bookworm From 64aa8b8ae276e05786fe81571e0124b2780651ea Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 10:04:25 +0200 Subject: [PATCH 18/24] add new // jobs for centos --- .github/workflows/main.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd78cc7..a1ec595 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,3 +52,34 @@ jobs: run: | cd tools ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r debian-${{ matrix.debian-version }} + + + centos-builds: + if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + environment: build + name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php-version: [php73, php74] #php72, php80, php81, php82 + centos-version: [6, 7] #8 + + steps: + - name: Clone Quanta PHP Module repository + uses: actions/checkout@v3 + with: + path: php-module + + - name: Clone Buildozer repository + uses: actions/checkout@v3 + with: + ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} + repository: quanta-computing/buildozer + persist-credentials: true + path: tools + + - name: Build the PHP package + run: | + cd tools + ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} From 229245e52be4c77b104b2ce6b1c7be74c88f245c Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 11:07:27 +0200 Subject: [PATCH 19/24] try to put packages as artifact --- .github/workflows/main.yml | 69 +++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1ec595..1c79d2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,35 +51,50 @@ jobs: - name: Build the PHP package run: | cd tools - ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r debian-${{ matrix.debian-version }} + ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} + - name: gzip packages + run: | + cd tools/buildozer/debian/pkg/ + tar czvf debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz ${{ matrix.php-version }}-quanta-mon-${{ matrix.debian-version }} - centos-builds: - if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') - environment: build - name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - php-version: [php73, php74] #php72, php80, php81, php82 - centos-version: [6, 7] #8 - - steps: - - name: Clone Quanta PHP Module repository - uses: actions/checkout@v3 + - name: Upload package to release + uses: svenstaro/upload-release-action@v2 with: - path: php-module + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: tools/buildozer/debian/pkg/debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + asset_name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + tag: ${{ github.ref }} + overwrite: true + body: "Packages of ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }} are ready" - - name: Clone Buildozer repository - uses: actions/checkout@v3 - with: - ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} - repository: quanta-computing/buildozer - persist-credentials: true - path: tools - - name: Build the PHP package - run: | - cd tools - ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} + # centos-builds: + # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + # environment: build + # name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # php-version: [php73, php74] #php72, php80, php81, php82 + # centos-version: [6, 7] #8 + + # steps: + # - name: Clone Quanta PHP Module repository + # uses: actions/checkout@v3 + # with: + # path: php-module + + # - name: Clone Buildozer repository + # uses: actions/checkout@v3 + # with: + # ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} + # repository: quanta-computing/buildozer + # persist-credentials: true + # path: tools + + # - name: Build the PHP package + # run: | + # cd tools + # ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} From 9d5118f7cfed57bdda782ebfc10f2acce1641384 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Wed, 2 Aug 2023 11:12:32 +0200 Subject: [PATCH 20/24] try gzip again --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c79d2b..64fb9ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,14 +55,14 @@ jobs: - name: gzip packages run: | - cd tools/buildozer/debian/pkg/ + cd tools/debian/${{ matrix.debian-version }}/pkg/ tar czvf debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz ${{ matrix.php-version }}-quanta-mon-${{ matrix.debian-version }} - name: Upload package to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: tools/buildozer/debian/pkg/debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + file: tools/debian/${{ matrix.debian-version }}/pkg/debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz asset_name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz tag: ${{ github.ref }} overwrite: true From ea3b04c31c34ea3cb078da4685813c5dcdc45782 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Thu, 3 Aug 2023 11:37:16 +0200 Subject: [PATCH 21/24] change upload method --- .github/workflows/main.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64fb9ff..0aeed2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: php-version: [php73, php74] #php72, php80, php81, php82 - debian-version: [jessie, stretch, buster] #bullseye, bookworm + debian-version: [buster] #bullseye, bookworm steps: - name: Clone Quanta PHP Module repository @@ -53,21 +53,11 @@ jobs: cd tools ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} - - name: gzip packages - run: | - cd tools/debian/${{ matrix.debian-version }}/pkg/ - tar czvf debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz ${{ matrix.php-version }}-quanta-mon-${{ matrix.debian-version }} - - - name: Upload package to release - uses: svenstaro/upload-release-action@v2 + - name: Upload packages + uses: actions/upload-artifact@v3 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: tools/debian/${{ matrix.debian-version }}/pkg/debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz - asset_name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz - tag: ${{ github.ref }} - overwrite: true - body: "Packages of ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }} are ready" - + name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + path: tools/debian/${{ matrix.debian-version }}/pkg/ # centos-builds: # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') From add210bdd443486622d644859071d51ebcfe322c Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Thu, 3 Aug 2023 11:45:59 +0200 Subject: [PATCH 22/24] tests centos builds --- .github/workflows/main.yml | 78 ++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0aeed2b..503a79f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,16 +23,52 @@ env: PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - debian-builds: + # debian-builds: + # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + # environment: build + # name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # php-version: [php73, php74] #php72, php80, php81, php82 + # debian-version: [buster] #bullseye, bookworm + + # steps: + # - name: Clone Quanta PHP Module repository + # uses: actions/checkout@v3 + # with: + # path: php-module + + # - name: Clone Buildozer repository + # uses: actions/checkout@v3 + # with: + # ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} + # repository: quanta-computing/buildozer + # persist-credentials: true + # path: tools + + # - name: Build the PHP package + # run: | + # cd tools + # ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} + + # - name: Upload packages + # uses: actions/upload-artifact@v3 + # with: + # name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + # path: tools/debian/${{ matrix.debian-version }}/pkg/ + + centos-builds: if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') environment: build - name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' + name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' runs-on: ubuntu-latest strategy: fail-fast: false matrix: php-version: [php73, php74] #php72, php80, php81, php82 - debian-version: [buster] #bullseye, bookworm + centos-version: [7] #8 steps: - name: Clone Quanta PHP Module repository @@ -51,40 +87,10 @@ jobs: - name: Build the PHP package run: | cd tools - ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} + ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} - name: Upload packages uses: actions/upload-artifact@v3 with: - name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz - path: tools/debian/${{ matrix.debian-version }}/pkg/ - - # centos-builds: - # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') - # environment: build - # name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # php-version: [php73, php74] #php72, php80, php81, php82 - # centos-version: [6, 7] #8 - - # steps: - # - name: Clone Quanta PHP Module repository - # uses: actions/checkout@v3 - # with: - # path: php-module - - # - name: Clone Buildozer repository - # uses: actions/checkout@v3 - # with: - # ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} - # repository: quanta-computing/buildozer - # persist-credentials: true - # path: tools - - # - name: Build the PHP package - # run: | - # cd tools - # ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} + name: centos-${{ matrix.centos-version }}-${{ matrix.php-version }}.tgz + path: tools/centos/${{ matrix.centos-version }}/pkg/ From 763e75f4f5c5abd4f7ef593f11741be4c7e8e6f9 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Thu, 3 Aug 2023 12:28:17 +0200 Subject: [PATCH 23/24] add bullseye for debian builds --- .github/workflows/main.yml | 85 +++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 503a79f..2155d11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,52 +23,16 @@ env: PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - # debian-builds: - # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') - # environment: build - # name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # php-version: [php73, php74] #php72, php80, php81, php82 - # debian-version: [buster] #bullseye, bookworm - - # steps: - # - name: Clone Quanta PHP Module repository - # uses: actions/checkout@v3 - # with: - # path: php-module - - # - name: Clone Buildozer repository - # uses: actions/checkout@v3 - # with: - # ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} - # repository: quanta-computing/buildozer - # persist-credentials: true - # path: tools - - # - name: Build the PHP package - # run: | - # cd tools - # ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} - - # - name: Upload packages - # uses: actions/upload-artifact@v3 - # with: - # name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz - # path: tools/debian/${{ matrix.debian-version }}/pkg/ - - centos-builds: + debian-builds: if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') environment: build - name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' + name: 'Building ${{ matrix.php-version }} for Debian ${{ matrix.debian-version }}' runs-on: ubuntu-latest strategy: fail-fast: false matrix: php-version: [php73, php74] #php72, php80, php81, php82 - centos-version: [7] #8 + debian-version: [buster, bullseye] #, bookworm steps: - name: Clone Quanta PHP Module repository @@ -81,16 +45,53 @@ jobs: with: ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} repository: quanta-computing/buildozer + ref: 'new-packages-worflow' persist-credentials: true path: tools - name: Build the PHP package run: | cd tools - ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} + ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -s ../php-module/extension/ -r ${{ matrix.debian-version }} - name: Upload packages uses: actions/upload-artifact@v3 with: - name: centos-${{ matrix.centos-version }}-${{ matrix.php-version }}.tgz - path: tools/centos/${{ matrix.centos-version }}/pkg/ + name: debian-${{ matrix.debian-version }}-${{ matrix.php-version }}.tgz + path: tools/debian/${{ matrix.debian-version }}/pkg/ + + # centos-builds: + # if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release') + # environment: build + # name: 'Building ${{ matrix.php-version }} for CentOS ${{ matrix.centos-version }}' + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # php-version: [php73, php74] #php72, php80, php81, php82 + # centos-version: [7] #8 + + # steps: + # - name: Clone Quanta PHP Module repository + # uses: actions/checkout@v3 + # with: + # path: php-module + + # - name: Clone Buildozer repository + # uses: actions/checkout@v3 + # with: + # ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }} + # repository: quanta-computing/buildozer + # persist-credentials: true + # path: tools + + # - name: Build the PHP package + # run: | + # cd tools + # ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o centos -v ${{ matrix.centos-version }} -s ../php-module/extension/ -r centos-${{ matrix.centos-version }} + + # - name: Upload packages + # uses: actions/upload-artifact@v3 + # with: + # name: centos-${{ matrix.centos-version }}-${{ matrix.php-version }}.tgz + # path: tools/centos/${{ matrix.centos-version }}/pkg/ From 5b7759bffbd2cffb84e34253a4ff3d060a2d4407 Mon Sep 17 00:00:00 2001 From: Julien Barritaud Date: Thu, 3 Aug 2023 17:36:41 +0200 Subject: [PATCH 24/24] rebuild --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2155d11..a38d5e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: php-version: [php73, php74] #php72, php80, php81, php82 - debian-version: [buster, bullseye] #, bookworm + debian-version: [buster, bullseye] #, bookworm # steps: - name: Clone Quanta PHP Module repository