From db5ed9b6911ee9d0cdbf91ae519d5a510d3b832f Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 18:25:20 +0700 Subject: [PATCH 01/11] ci: update formatter workflow --- .github/workflows/workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 649d72f..8f1cb11 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -67,8 +67,11 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + - name: Update ubuntu repo + run: sudo apt update -y + - name: Install shfmt - run: brew install shfmt + run: sudo apt install -y shfmt - name: Run shfmt run: make fmt-check From 4951d8291bf4e1302b369a74c1ad052f029c7b92 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 19:56:39 +0700 Subject: [PATCH 02/11] ci: test ubuntu --- .github/workflows/workflow.yml | 59 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8f1cb11..59fa73e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,10 +1,10 @@ name: Main workflow on: - pull_request: push: - schedule: - - cron: 0 0 * * 5 + branches: + - master + pull_request: jobs: plugin-test-docker: @@ -15,7 +15,6 @@ jobs: php-version: - 7.4.14 - 8.0.0 - - latest env: DEBIAN_FRONTEND: noninteractive @@ -27,38 +26,38 @@ jobs: steps: - name: Install packages - run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev + run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev libgmp-dev libsodium-dev openssl pkg-config re2c zlib1g-dev - name: asdf_plugin_test - uses: asdf-vm/actions/plugin-test@v1 + uses: asdf-vm/actions/plugin-test@v3 with: command: php --version version: ${{ matrix.php-version }} - plugin-test-vm: - strategy: - matrix: - os: - - macos-latest - php-version: - - 7.4.14 - - 8.0.0 - - latest - - runs-on: ${{ matrix.os }} - - steps: - - name: Install packages - run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip openssl@1.1 pkg-config re2c zlib - - - name: Install conflicting packages - run: brew install openssl@3 - - - name: asdf_plugin_test - uses: asdf-vm/actions/plugin-test@v1 - with: - command: php --version - version: ${{ matrix.php-version }} + # plugin-test-vm: + # strategy: + # matrix: + # os: + # - macos-latest + # php-version: + # - 7.4.14 + # - 8.0.0 + # - latest + + # runs-on: ${{ matrix.os }} + + # steps: + # - name: Install packages + # run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip openssl@1.1 pkg-config re2c zlib + + # - name: Install conflicting packages + # run: brew install openssl@3 + + # - name: asdf_plugin_test + # uses: asdf-vm/actions/plugin-test@v1 + # with: + # command: php --version + # version: ${{ matrix.php-version }} format: runs-on: ubuntu-latest From 9aa6e4930fd6fbc3bdbbf9a0ef5abc5c720edb15 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 20:06:35 +0700 Subject: [PATCH 03/11] simplify versioning --- bin/list-all | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bin/list-all b/bin/list-all index 935241c..5e8b4b0 100755 --- a/bin/list-all +++ b/bin/list-all @@ -2,18 +2,14 @@ set -eo pipefail -sort_versions() { - sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | - LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}' -} - versions=$( git ls-remote --tags https://github.com/php/php-src.git | grep 'php-' | - awk '!/({})/ {print $2}' | + grep -E -v '\^\{\}' | + cut -f2 | sed 's/refs\/tags\/php-//' | grep -E -v -i "rc|alpha|beta|dev|pre" | - sort_versions | + sort -V | xargs ) From c6bda9f2621f3df7408868fbec627e4a913de192 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 20:09:38 +0700 Subject: [PATCH 04/11] fix missing dep --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 59fa73e..9d676b3 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Install packages - run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev libgmp-dev libsodium-dev openssl pkg-config re2c zlib1g-dev + run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev libgmp-dev libsodium-dev openssl pkg-config re2c zlib1g-dev libxslt1-dev - name: asdf_plugin_test uses: asdf-vm/actions/plugin-test@v3 From f9bce1328f5bd19945e0970502c17fce4ddad1c8 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 20:33:45 +0700 Subject: [PATCH 05/11] trigger ci --- .github/workflows/workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9d676b3..dda9f88 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -13,7 +13,6 @@ jobs: container: - ubuntu:latest php-version: - - 7.4.14 - 8.0.0 env: From a8847263462f8c962d9a372a9474772347369023 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 20:36:23 +0700 Subject: [PATCH 06/11] using selfhosted ci --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index dda9f88..f449f99 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: container: image: ${{ matrix.container }} - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Install packages @@ -59,7 +59,7 @@ jobs: # version: ${{ matrix.php-version }} format: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Checkout code From 419bc171a6e4e8e9d29d0d98a56df7baf706c15a Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 21:56:35 +0700 Subject: [PATCH 07/11] change php version --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f449f99..e1a0b70 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -13,7 +13,7 @@ jobs: container: - ubuntu:latest php-version: - - 8.0.0 + - 8.3.0 env: DEBIAN_FRONTEND: noninteractive From f131b67aeb22e5fabed92eea4c4b2d0b625ab98e Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 22:25:59 +0700 Subject: [PATCH 08/11] feat(ext): use custom image --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e1a0b70..3efa320 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,8 +24,8 @@ jobs: runs-on: self-hosted steps: - - name: Install packages - run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev libgmp-dev libsodium-dev openssl pkg-config re2c zlib1g-dev libxslt1-dev + # - name: Install packages + # run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev libgmp-dev libsodium-dev openssl pkg-config re2c zlib1g-dev libxslt1-dev - name: asdf_plugin_test uses: asdf-vm/actions/plugin-test@v3 From baf7a449cffa2555037e1d464451fba387ba42b6 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 22:34:15 +0700 Subject: [PATCH 09/11] change container name --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3efa320..ffc8504 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: container: - - ubuntu:latest + - rendyananta/ubuntu-asdf-php:latest php-version: - 8.3.0 From 880cac54aa6bd633473453cbc2fc8e4870e59ac7 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 22:58:41 +0700 Subject: [PATCH 10/11] change container name --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ffc8504..3500f44 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: container: - - rendyananta/ubuntu-asdf-php:latest + - ghcr.io/rendyananta/ubuntu-asdf-php:latest php-version: - 8.3.0 From e0d3e445f8d735b7e7676c037477cf8e0833baa1 Mon Sep 17 00:00:00 2001 From: Rendy Date: Sun, 22 Sep 2024 23:08:27 +0700 Subject: [PATCH 11/11] change container name --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3500f44..e054581 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: container: - - ghcr.io/rendyananta/ubuntu-asdf-php:latest + - ghcr.io/rendyananta/asdf-php-ubuntu:latest php-version: - 8.3.0