From aaa814f1b20e400799943e792f29fa23cb4eaccc Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:15:49 +0800 Subject: [PATCH 01/53] Add test workflow --- .github/workflows/test.yaml | 48 +++++++++++++++++++++++++++++++++++++ hooks/post_install.lua | 1 + 2 files changed, 49 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 0000000..a7ffe69 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,48 @@ +name: Test workflow + +on: + pull_request: + push: + schedule: + - cron: 0 0 * * 5 + +jobs: + plugin-test-linux: + runs-on: ubuntu-latest + steps: + - name: Install vfox + run: | + echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list + apt-get update + apt-get install vfox + + - name: View vfox version + run: | + vfox -v + vfox available + + - name: Checkout code + uses: actions/checkout@v3 + + - name: Add PHP plugin + run: | + mkdir ~/.version-fox/plugin/php + cp -r ./* ~/.version-fox/plugin/php + + - name: Search PHP version + run: | + vfox search php & + sleep 3 + + - name: Install packages + run: apt-get install -y locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev + + - name: Install PHP + run: | + vfox i php + export __VFOX_SHELL="$$" + vfox use php@$(vfox list php | sed -n 's/-> v//p') + eval "$(vfox env -s bash)" + php -v + php -m + composer -V diff --git a/hooks/post_install.lua b/hooks/post_install.lua index be91440..053a939 100644 --- a/hooks/post_install.lua +++ b/hooks/post_install.lua @@ -45,6 +45,7 @@ function InstallComposerForWin(path) end function CompileInstallPHP(path) + RUNTIME.pluginDirPath = '~/.version-fox/plugin/php' os.execute('chmod +x ' .. RUNTIME.pluginDirPath .. '/bin/install') local code = os.execute(RUNTIME.pluginDirPath .. '/bin/install ' .. path) if code ~= 0 then From 907404184a0d0f20b7c94084ca7f43214ad18ed4 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:21:55 +0800 Subject: [PATCH 02/53] ci --- .github/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a7ffe69..9ad945d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,6 +12,9 @@ jobs: steps: - name: Install vfox run: | + echo "Current user: $(whoami)" + echo "Current directory: $(pwd)" + echo "Contents of directory: $(ls -l)" echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list apt-get update apt-get install vfox From c0f435864a05dfd6f4e803f834bf9b06b7bceada Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:23:18 +0800 Subject: [PATCH 03/53] ci --- .github/workflows/test.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9ad945d..4d2c0c9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,10 +12,7 @@ jobs: steps: - name: Install vfox run: | - echo "Current user: $(whoami)" - echo "Current directory: $(pwd)" - echo "Contents of directory: $(ls -l)" - echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list + sudo echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list apt-get update apt-get install vfox From b80687980dde1bba94da0863f57fec8d388737ba Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:42:26 +0800 Subject: [PATCH 04/53] ci --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4d2c0c9..d4c3bd5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,10 +9,11 @@ on: jobs: plugin-test-linux: runs-on: ubuntu-latest + container: ubuntu-latest steps: - name: Install vfox run: | - sudo echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list + echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list apt-get update apt-get install vfox From a000757f07dc0f22a4a578b6507b9ab50193d5d6 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:46:14 +0800 Subject: [PATCH 05/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d4c3bd5..7a73e74 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ on: jobs: plugin-test-linux: runs-on: ubuntu-latest - container: ubuntu-latest + container: ubuntu:latest steps: - name: Install vfox run: | From 82aa45399b6191848dd7db1bad02acc51e05baca Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:50:17 +0800 Subject: [PATCH 06/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7a73e74..fedbba3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,7 +15,7 @@ jobs: run: | echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list apt-get update - apt-get install vfox + apt-get install ca-certificates vfox - name: View vfox version run: | From 4004255010b3941aab3826fdee68ee560ee6985e Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:52:13 +0800 Subject: [PATCH 07/53] ci --- .github/workflows/test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fedbba3..12bb568 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,9 +13,11 @@ jobs: steps: - name: Install vfox run: | + apt-get update + apt-get install -y ca-certificates echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list apt-get update - apt-get install ca-certificates vfox + apt-get install vfox - name: View vfox version run: | From a283244a02fc3ec33c3b4fbdcfd964153138bec2 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:53:54 +0800 Subject: [PATCH 08/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 12bb568..a494b36 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -38,7 +38,7 @@ jobs: sleep 3 - name: Install packages - run: apt-get install -y locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev + run: apt-get install -y autoconf locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev - name: Install PHP run: | From bab6624e6e66c96dc3ed054cc0ba93d0de75ee1d Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:56:26 +0800 Subject: [PATCH 09/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a494b36..512400a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -38,7 +38,7 @@ jobs: sleep 3 - name: Install packages - run: apt-get install -y autoconf locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev - name: Install PHP run: | From 93f9fc529d85684857246dd7817851044998d4ee Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 11:58:25 +0800 Subject: [PATCH 10/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 512400a..84f953a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,7 +2,7 @@ name: Test workflow on: pull_request: - push: + # push: schedule: - cron: 0 0 * * 5 @@ -38,7 +38,7 @@ jobs: sleep 3 - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev - name: Install PHP run: | From 530464941999254886b212af4b893d1efc5f8b03 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:01:40 +0800 Subject: [PATCH 11/53] ci --- .github/workflows/test.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 84f953a..69e34e8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -23,6 +23,7 @@ jobs: run: | vfox -v vfox available + echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - name: Checkout code uses: actions/checkout@v3 @@ -34,11 +35,12 @@ jobs: - name: Search PHP version run: | + echo $__VFOX_SHELL vfox search php & - sleep 3 + sleep 1 - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev openssl - name: Install PHP run: | From 3a4ec9556d899a4b2e5fbefbb061106f5775e933 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:05:25 +0800 Subject: [PATCH 12/53] ci --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 69e34e8..c839328 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,6 +24,7 @@ jobs: vfox -v vfox available echo 'eval "$(vfox activate bash)"' >> ~/.bashrc + source ~/.bashrc - name: Checkout code uses: actions/checkout@v3 @@ -40,7 +41,7 @@ jobs: sleep 1 - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev openssl + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev - name: Install PHP run: | From 200db71c062f0a50da793122013741f5797ed0d5 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:07:38 +0800 Subject: [PATCH 13/53] ci --- .github/workflows/test.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c839328..29cf0aa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -23,8 +23,6 @@ jobs: run: | vfox -v vfox available - echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - source ~/.bashrc - name: Checkout code uses: actions/checkout@v3 @@ -36,9 +34,7 @@ jobs: - name: Search PHP version run: | - echo $__VFOX_SHELL vfox search php & - sleep 1 - name: Install packages run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev From 812534fb051857078c2b0cdad0563197d3af89c8 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:10:21 +0800 Subject: [PATCH 14/53] ci --- .github/workflows/test.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 29cf0aa..e53e669 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,11 +33,10 @@ jobs: cp -r ./* ~/.version-fox/plugin/php - name: Search PHP version - run: | - vfox search php & + run: vfox search php - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev - name: Install PHP run: | From edc5f4eee9b4453bac1485fa95dd8886339c4cee Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:12:26 +0800 Subject: [PATCH 15/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e53e669..d080ce6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,7 +33,7 @@ jobs: cp -r ./* ~/.version-fox/plugin/php - name: Search PHP version - run: vfox search php + run: vfox search php & - name: Install packages run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev From e12f79cdc0306a8cda863a2a6ac6ca47dd68e33c Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:15:04 +0800 Subject: [PATCH 16/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d080ce6..0c5324d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -36,7 +36,7 @@ jobs: run: vfox search php & - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev - name: Install PHP run: | From e1a28927852614385126cc440fe0c041354edd19 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 12:17:13 +0800 Subject: [PATCH 17/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0c5324d..0a706ee 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -36,7 +36,7 @@ jobs: run: vfox search php & - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev + run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - name: Install PHP run: | From 8be4a76c76a4fe82dcf6c8cb58e78e0e20b3ae79 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 13:06:53 +0800 Subject: [PATCH 18/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0a706ee..f6506b0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -36,7 +36,7 @@ jobs: run: vfox search php & - name: Install packages - run: apt-get install -y autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - name: Install PHP run: | From 486a7305f654190b091086a821acab67b5b2826d Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 13:27:10 +0800 Subject: [PATCH 19/53] ci --- .github/workflows/test.yaml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f6506b0..e780506 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,18 +32,27 @@ jobs: mkdir ~/.version-fox/plugin/php cp -r ./* ~/.version-fox/plugin/php - - name: Search PHP version - run: vfox search php & - - - name: Install packages - run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - - - name: Install PHP + # - name: Search PHP version + # run: vfox search php & + + # - name: Install packages + # run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + + # - name: Install PHP + # run: | + # vfox i php + # export __VFOX_SHELL="$$" + # vfox use php@$(vfox list php | sed -n 's/-> v//p') + # eval "$(vfox env -s bash)" + # php -v + # php -m + # composer -V + + - name: Test run: | - vfox i php + mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" vfox use php@$(vfox list php | sed -n 's/-> v//p') + echo $PATH eval "$(vfox env -s bash)" - php -v - php -m - composer -V + echo $PATH From 54932da0ffa8107627d61b1e78f892ef8d683f61 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 13:32:18 +0800 Subject: [PATCH 20/53] ci --- .github/workflows/test.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e780506..0d13fdb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -53,6 +53,4 @@ jobs: mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" vfox use php@$(vfox list php | sed -n 's/-> v//p') - echo $PATH - eval "$(vfox env -s bash)" - echo $PATH + vfox env -s bash From ea4f5d2df1a176a90498711d67fd8942b88b123d Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 13:56:55 +0800 Subject: [PATCH 21/53] ci --- .github/workflows/test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0d13fdb..90373d1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -53,4 +53,9 @@ jobs: mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" vfox use php@$(vfox list php | sed -n 's/-> v//p') + echo "PATH: $PATH" + echo '--------------------' vfox env -s bash + echo '--------------------' + eval "$(vfox env -s bash)" + echo "PATH: $PATH" From 8c59d3f938587932f10e233240dd7cc2b1aaed81 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 14:21:09 +0800 Subject: [PATCH 22/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 90373d1..a5440b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,5 +57,5 @@ jobs: echo '--------------------' vfox env -s bash echo '--------------------' - eval "$(vfox env -s bash)" + eval "export PATH=$'/github/home/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';" echo "PATH: $PATH" From 81e830d206d3490eee806f1b5536f564fd3cd3f2 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 14:25:16 +0800 Subject: [PATCH 23/53] ci --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a5440b1..ca428a1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -59,3 +59,5 @@ jobs: echo '--------------------' eval "export PATH=$'/github/home/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';" echo "PATH: $PATH" + eval "export PATH='/github/home/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';" + echo "PATH: $PATH" From 16de435abb4a3ab27ec79a2375c25f102f66a7f9 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 14:36:47 +0800 Subject: [PATCH 24/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ca428a1..7f4608f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,7 +57,7 @@ jobs: echo '--------------------' vfox env -s bash echo '--------------------' - eval "export PATH=$'/github/home/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';" + eval "$(vfox env -s bash)" echo "PATH: $PATH" - eval "export PATH='/github/home/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';" + eval $(vfox env -s bash) echo "PATH: $PATH" From 0f2a2079713fff91ad6fe22c5e539643393507c2 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:19:42 +0800 Subject: [PATCH 25/53] ci --- .github/workflows/test.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7f4608f..cafb688 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -50,14 +50,6 @@ jobs: - name: Test run: | - mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin - export __VFOX_SHELL="$$" - vfox use php@$(vfox list php | sed -n 's/-> v//p') - echo "PATH: $PATH" - echo '--------------------' - vfox env -s bash - echo '--------------------' - eval "$(vfox env -s bash)" - echo "PATH: $PATH" - eval $(vfox env -s bash) - echo "PATH: $PATH" + eval echo $'sss' + eval echo 'ddd' + bash --version From 039604b227bfd2f091acff3022e38920ce3dd4a2 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:28:26 +0800 Subject: [PATCH 26/53] ci --- .github/workflows/test.yaml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cafb688..b2171df 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,24 +32,18 @@ jobs: mkdir ~/.version-fox/plugin/php cp -r ./* ~/.version-fox/plugin/php - # - name: Search PHP version - # run: vfox search php & - - # - name: Install packages - # run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - - # - name: Install PHP - # run: | - # vfox i php - # export __VFOX_SHELL="$$" - # vfox use php@$(vfox list php | sed -n 's/-> v//p') - # eval "$(vfox env -s bash)" - # php -v - # php -m - # composer -V - - - name: Test + - name: Search PHP version + run: vfox search php & + + - name: Install packages + run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + + - name: Install PHP run: | - eval echo $'sss' - eval echo 'ddd' - bash --version + vfox i php + export __VFOX_SHELL="$$" + vfox use php@$(vfox list php | sed -n 's/-> v//p') + eval "$(vfox env -s zsh)" + php -v + php -m + composer -V From e0b46fe69fd9fca108dcce6a515d0c4c0a1a3f60 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:47:40 +0800 Subject: [PATCH 27/53] ci --- .github/workflows/test.yaml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b2171df..82d008d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,18 +32,30 @@ jobs: mkdir ~/.version-fox/plugin/php cp -r ./* ~/.version-fox/plugin/php - - name: Search PHP version - run: vfox search php & - - - name: Install packages - run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - - - name: Install PHP + # - name: Search PHP version + # run: vfox search php & + + # - name: Install packages + # run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + + # - name: Install PHP + # run: | + # vfox i php + # export __VFOX_SHELL="$$" + # vfox use php@$(vfox list php | sed -n 's/-> v//p') + # eval "$(vfox env -s zsh)" + # php -v + # php -m + # composer -V + + - name: Test run: | - vfox i php + mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" vfox use php@$(vfox list php | sed -n 's/-> v//p') + echo "PATH: $PATH" + echo '--------------------' + vfox env -s zsh + echo '--------------------' eval "$(vfox env -s zsh)" - php -v - php -m - composer -V + echo "PATH: $PATH" From 4f116505e136b4dcdf459e828a625635cbc7413b Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:51:20 +0800 Subject: [PATCH 28/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 82d008d..a2158e1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -55,7 +55,7 @@ jobs: vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" echo '--------------------' - vfox env -s zsh + vfox env -s bash | sed -n 's/$//p' echo '--------------------' - eval "$(vfox env -s zsh)" + eval "$(vfox env -s bash | sed -n 's/$//p')" echo "PATH: $PATH" From 49b599d12af6ee97879b3773c0ae74b7b3769b0c Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:55:00 +0800 Subject: [PATCH 29/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a2158e1..4ae7f4c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -55,7 +55,7 @@ jobs: vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" echo '--------------------' - vfox env -s bash | sed -n 's/$//p' + vfox env -s bash | sed -n 's/\$//p' echo '--------------------' - eval "$(vfox env -s bash | sed -n 's/$//p')" + eval "$(vfox env -s bash | sed -n 's/\$//p')" echo "PATH: $PATH" From 8b5843e3109c8ae5278224d26ad53d90507ba97d Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 15:57:28 +0800 Subject: [PATCH 30/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4ae7f4c..3f8a9b6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -55,7 +55,7 @@ jobs: vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" echo '--------------------' - vfox env -s bash | sed -n 's/\$//p' + vfox env -s bash | sed -n 's/\$//g' echo '--------------------' - eval "$(vfox env -s bash | sed -n 's/\$//p')" + eval "$(vfox env -s bash | sed -n 's/\$//g')" echo "PATH: $PATH" From 8fda9cc8c3b41b195e75d32715718af46f678e91 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 16:00:29 +0800 Subject: [PATCH 31/53] ci --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3f8a9b6..2ff735b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -55,7 +55,7 @@ jobs: vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" echo '--------------------' - vfox env -s bash | sed -n 's/\$//g' + vfox env -s bash | tr -d '$' echo '--------------------' - eval "$(vfox env -s bash | sed -n 's/\$//g')" + eval "$(vfox env -s bash | tr -d '$')" echo "PATH: $PATH" From f487a993dc6baba3d5565112b581197e80abfe9a Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 16:17:54 +0800 Subject: [PATCH 32/53] ci --- .github/workflows/test.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2ff735b..e868009 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -52,10 +52,7 @@ jobs: run: | mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" + echo 'eval "$(vfox activate bash)"' >> ~/.bashrc + source ~/.bashrc vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" - echo '--------------------' - vfox env -s bash | tr -d '$' - echo '--------------------' - eval "$(vfox env -s bash | tr -d '$')" - echo "PATH: $PATH" From ca572eec4804c746852b776fb6e622825d8b7220 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 16:22:19 +0800 Subject: [PATCH 33/53] ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e868009..217a7ee 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -53,6 +53,6 @@ jobs: mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - source ~/.bashrc + . ~/.bashrc vfox use php@$(vfox list php | sed -n 's/-> v//p') echo "PATH: $PATH" From d792b596eff6e1941094157238df4895948bdd5e Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 17:10:47 +0800 Subject: [PATCH 34/53] ci --- .github/workflows/test.yaml | 5 +++-- hooks/post_install.lua | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 217a7ee..e18f222 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -52,7 +52,8 @@ jobs: run: | mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin export __VFOX_SHELL="$$" - echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - . ~/.bashrc vfox use php@$(vfox list php | sed -n 's/-> v//p') + eval "$(vfox env -s zsh)" + echo "PATH: $PATH" + export PATH="$(echo $PATH | tr -d '$')" echo "PATH: $PATH" diff --git a/hooks/post_install.lua b/hooks/post_install.lua index 053a939..be91440 100644 --- a/hooks/post_install.lua +++ b/hooks/post_install.lua @@ -45,7 +45,6 @@ function InstallComposerForWin(path) end function CompileInstallPHP(path) - RUNTIME.pluginDirPath = '~/.version-fox/plugin/php' os.execute('chmod +x ' .. RUNTIME.pluginDirPath .. '/bin/install') local code = os.execute(RUNTIME.pluginDirPath .. '/bin/install ' .. path) if code ~= 0 then From 4408b673591c56d13ea2bd5c724fe4ad52c22623 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 17:12:08 +0800 Subject: [PATCH 35/53] ci --- .github/workflows/test.yaml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e18f222..ece2abf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,28 +32,19 @@ jobs: mkdir ~/.version-fox/plugin/php cp -r ./* ~/.version-fox/plugin/php - # - name: Search PHP version - # run: vfox search php & - - # - name: Install packages - # run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - - # - name: Install PHP - # run: | - # vfox i php - # export __VFOX_SHELL="$$" - # vfox use php@$(vfox list php | sed -n 's/-> v//p') - # eval "$(vfox env -s zsh)" - # php -v - # php -m - # composer -V - - - name: Test + - name: Search PHP version + run: vfox search php & + + - name: Install packages + run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + + - name: Install PHP run: | - mkdir -p ~/.version-fox/cache/php/v-8.3.3/php-8.3.3/bin + vfox i php export __VFOX_SHELL="$$" vfox use php@$(vfox list php | sed -n 's/-> v//p') eval "$(vfox env -s zsh)" - echo "PATH: $PATH" export PATH="$(echo $PATH | tr -d '$')" - echo "PATH: $PATH" + php -v + php -m + composer -V From dfeb15050f67b4dbd314eef9b36169ff64ba774a Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:21:42 +0800 Subject: [PATCH 36/53] fix ci --- .github/workflows/test.yaml | 69 ++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ece2abf..2bb1491 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,43 +8,72 @@ on: jobs: plugin-test-linux: - runs-on: ubuntu-latest + strategy: + matrix: + # ref: https://github.com/actions/runner-images + os: [ ubuntu-20.04, macos-13, windows-2022 ] + runs-on: ${{ matrix.os }} container: ubuntu:latest steps: - - name: Install vfox + - name: install vfox (Linux) + if: runner.os == 'Linux' run: | - apt-get update - apt-get install -y ca-certificates - echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | tee /etc/apt/sources.list.d/versionfox.list - apt-get update - apt-get install vfox + echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | sudo tee /etc/apt/sources.list.d/versionfox.list + sudo apt-get update + sudo apt-get install vfox + echo 'eval "$(vfox activate bash)"' >> ~/.bashrc + + - name: install vfox (MacOS) + if: runner.os == 'MacOS' + run: | + brew tap version-fox/tap + brew install vfox + echo 'eval "$(vfox activate bash)"' >> ~/.bashrc + echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc + + - name: install vfox (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: | + Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression + scoop install vfox - name: View vfox version run: | vfox -v - vfox available - name: Checkout code uses: actions/checkout@v3 - - name: Add PHP plugin + - name: Generate PHP plugin + if: runner.os != 'Windows' run: | - mkdir ~/.version-fox/plugin/php - cp -r ./* ~/.version-fox/plugin/php - - - name: Search PHP version - run: vfox search php & + zip -r php.zip ./ + - name: Generate PHP plugin + if: runner.os == 'Windows' + run: | + Compress-Archive -Path .\* -DestinationPath .\php.zip - name: Install packages + if: runner.os == 'Linux' run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + - name: Install packages + if: runner.os == 'MacOS' + run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib + + - name: Add PHP And Install Runtime + run: | + vfox add -s php.zip + vfox install php@8.3.3 + + # php -v + # php -m + # composer -V - - name: Install PHP + - name: Test run: | - vfox i php - export __VFOX_SHELL="$$" - vfox use php@$(vfox list php | sed -n 's/-> v//p') - eval "$(vfox env -s zsh)" - export PATH="$(echo $PATH | tr -d '$')" php -v php -m composer -V + From 28d160f806d7ac57a2ad8fa04efc345a1108b60f Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:22:48 +0800 Subject: [PATCH 37/53] fix ci --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2bb1491..6a1eb1a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -73,6 +73,7 @@ jobs: - name: Test run: | + vfox use php@8.3.3 php -v php -m composer -V From 6ac181226da9f95f48f845ea458a1507bfc81214 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:24:24 +0800 Subject: [PATCH 38/53] fix ci --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6a1eb1a..da56688 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,7 +13,6 @@ jobs: # ref: https://github.com/actions/runner-images os: [ ubuntu-20.04, macos-13, windows-2022 ] runs-on: ${{ matrix.os }} - container: ubuntu:latest steps: - name: install vfox (Linux) if: runner.os == 'Linux' From 16c8eb71fa13a5be7448b1cc5922ea015b6a6bc1 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:28:26 +0800 Subject: [PATCH 39/53] fix ci --- .github/workflows/test.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index da56688..68047b0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -56,7 +56,7 @@ jobs: - name: Install packages if: runner.os == 'Linux' - run: apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + run: sudo apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev - name: Install packages if: runner.os == 'MacOS' run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib @@ -71,9 +71,20 @@ jobs: # composer -V - name: Test + if: runner.os != 'Windows' run: | vfox use php@8.3.3 php -v php -m composer -V + - name: Test + if: runner.os == 'Windows' + shell: pwsh + run: | + vfox use -p php@8.3.3 + Invoke-Expression "$(vfox activate pwsh)" + php -v + php -m + composer -V + From 6f4439825e273785340dd5f79156939415bd3ba2 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:32:29 +0800 Subject: [PATCH 40/53] fix ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 68047b0..4e7abca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -56,7 +56,7 @@ jobs: - name: Install packages if: runner.os == 'Linux' - run: sudo apt-get install -y curl autoconf build-essential locate libgd-dev libjpeg-dev libpng-dev libonig-dev libzip-dev libxml2-dev libssl-dev libsqlite3-dev libcurl4-openssl-dev libreadline-dev + run: sudo apt-get update && sudo 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 - name: Install packages if: runner.os == 'MacOS' run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib From 4667259e947ecfd00a1ab7324c30e353820793fb Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:33:44 +0800 Subject: [PATCH 41/53] fix ci --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4e7abca..4705132 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ ubuntu-20.04, macos-13, windows-2022 ] + os: [ ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: install vfox (Linux) From 9cf3cef3c726c9e89fb2a4df0aac7cd5bad331ce Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:40:17 +0800 Subject: [PATCH 42/53] fix ci --- .github/workflows/test.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4705132..2ea448b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,9 +37,6 @@ jobs: Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression scoop install vfox - - - name: View vfox version - run: | vfox -v - name: Checkout code From 627f44c96739091ae6ccb6d638618e83a2eda463 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:44:40 +0800 Subject: [PATCH 43/53] fix ci --- .../workflows/{test.yaml => test-unix.yaml} | 34 ++-------------- .github/workflows/test-windows.yaml | 40 +++++++++++++++++++ 2 files changed, 43 insertions(+), 31 deletions(-) rename .github/workflows/{test.yaml => test-unix.yaml} (67%) create mode 100644 .github/workflows/test-windows.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test-unix.yaml similarity index 67% rename from .github/workflows/test.yaml rename to .github/workflows/test-unix.yaml index 2ea448b..07db078 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test-unix.yaml @@ -11,9 +11,11 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ ubuntu-latest, macos-latest, windows-latest] + os: [ ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: + - name: Checkout code + uses: actions/checkout@v3 - name: install vfox (Linux) if: runner.os == 'Linux' run: | @@ -30,26 +32,9 @@ jobs: echo 'eval "$(vfox activate bash)"' >> ~/.bashrc echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc - - name: install vfox (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: | - Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression - scoop install vfox - vfox -v - - - name: Checkout code - uses: actions/checkout@v3 - - name: Generate PHP plugin - if: runner.os != 'Windows' run: | zip -r php.zip ./ - - name: Generate PHP plugin - if: runner.os == 'Windows' - run: | - Compress-Archive -Path .\* -DestinationPath .\php.zip - name: Install packages if: runner.os == 'Linux' @@ -63,25 +48,12 @@ jobs: vfox add -s php.zip vfox install php@8.3.3 - # php -v - # php -m - # composer -V - name: Test - if: runner.os != 'Windows' run: | vfox use php@8.3.3 php -v php -m composer -V - - name: Test - if: runner.os == 'Windows' - shell: pwsh - run: | - vfox use -p php@8.3.3 - Invoke-Expression "$(vfox activate pwsh)" - php -v - php -m - composer -V diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml new file mode 100644 index 0000000..31baa9e --- /dev/null +++ b/.github/workflows/test-windows.yaml @@ -0,0 +1,40 @@ +name: Test workflow + +on: + pull_request: + # push: + schedule: + - cron: 0 0 * * 5 + +jobs: + plugin-test-linux: + strategy: + matrix: + # ref: https://github.com/actions/runner-images + os: [ windows-latest] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: install vfox and test(Windows) + shell: pwsh + run: | + Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression + scoop install vfox + Compress-Archive -Path .\* -DestinationPath .\php.zip + vfox -v + vfox add -s php.zip + vfox install php@8.3.3 + + - name: Test + shell: pwsh + run: | + vfox use -p php@8.3.3 + Invoke-Expression "$(vfox activate pwsh)" + php -v + php -m + composer -V + + From 3b20dc021cfb2bcacb4cea475502235929c4c4f5 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:46:02 +0800 Subject: [PATCH 44/53] fix ci --- .github/workflows/test-windows.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index 31baa9e..aa35853 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -27,14 +27,9 @@ jobs: vfox -v vfox add -s php.zip vfox install php@8.3.3 - - - name: Test - shell: pwsh - run: | vfox use -p php@8.3.3 Invoke-Expression "$(vfox activate pwsh)" php -v php -m composer -V - From 920e8e0bca493ba3f798a19b22a3d28178f5bfac Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 17:49:11 +0800 Subject: [PATCH 45/53] fix ci --- .github/workflows/test-unix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml index 07db078..27e0aba 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-unix.yaml @@ -27,7 +27,7 @@ jobs: - name: install vfox (MacOS) if: runner.os == 'MacOS' run: | - brew tap version-fox/tap +# There may be delays brew install vfox echo 'eval "$(vfox activate bash)"' >> ~/.bashrc echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc From c4cc7a6f945201eee073c826d52471df95ab9dcf Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 17:52:05 +0800 Subject: [PATCH 46/53] ci --- .github/workflows/test-windows.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index aa35853..b663b88 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -7,11 +7,11 @@ on: - cron: 0 0 * * 5 jobs: - plugin-test-linux: + plugin-test-windows: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ windows-latest] + os: [windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -32,4 +32,3 @@ jobs: php -v php -m composer -V - From d8e651cb31f02a9a2e23b92e37476f53e943c6aa Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 17:54:47 +0800 Subject: [PATCH 47/53] ci --- .github/workflows/test-unix.yaml | 2 +- .github/workflows/test-windows.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml index 27e0aba..d14fb9b 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-unix.yaml @@ -1,4 +1,4 @@ -name: Test workflow +name: Test unix workflow on: pull_request: diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index b663b88..ae475f6 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -1,4 +1,4 @@ -name: Test workflow +name: Test windows workflow on: pull_request: From fcdc4d853787547903ac0bb362ef8e8573106d10 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 18:00:35 +0800 Subject: [PATCH 48/53] fix ci --- .github/workflows/test-unix.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml index d14fb9b..673f810 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-unix.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ ubuntu-latest, macos-latest] + os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -27,7 +27,6 @@ jobs: - name: install vfox (MacOS) if: runner.os == 'MacOS' run: | -# There may be delays brew install vfox echo 'eval "$(vfox activate bash)"' >> ~/.bashrc echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc From 89c88aabea0158a1c34318f80be4aa1823149010 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 18:03:09 +0800 Subject: [PATCH 49/53] fix ci --- .github/workflows/test-unix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml index 673f810..48db1ec 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-unix.yaml @@ -27,6 +27,7 @@ jobs: - name: install vfox (MacOS) if: runner.os == 'MacOS' run: | + brew upgrade brew install vfox echo 'eval "$(vfox activate bash)"' >> ~/.bashrc echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc From 32a9f0e19ffb65a5b0ddb2551c70c14c87a2f8b8 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 18:07:04 +0800 Subject: [PATCH 50/53] fix ci --- .github/workflows/test-unix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml index 48db1ec..c96f710 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-unix.yaml @@ -27,7 +27,7 @@ jobs: - name: install vfox (MacOS) if: runner.os == 'MacOS' run: | - brew upgrade + brew tap version-fox/tap brew install vfox echo 'eval "$(vfox activate bash)"' >> ~/.bashrc echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc From b6f3cf2b9e0eb85761712a36fe8d4769a331f816 Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 18:49:16 +0800 Subject: [PATCH 51/53] fix ci --- .../{test-unix.yaml => test-linux.yaml} | 31 ++++---------- .github/workflows/test-macos.yaml | 41 +++++++++++++++++++ 2 files changed, 48 insertions(+), 24 deletions(-) rename .github/workflows/{test-unix.yaml => test-linux.yaml} (60%) create mode 100644 .github/workflows/test-macos.yaml diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-linux.yaml similarity index 60% rename from .github/workflows/test-unix.yaml rename to .github/workflows/test-linux.yaml index c96f710..32490ea 100644 --- a/.github/workflows/test-unix.yaml +++ b/.github/workflows/test-linux.yaml @@ -11,49 +11,32 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} steps: - name: Checkout code uses: actions/checkout@v3 - name: install vfox (Linux) - if: runner.os == 'Linux' run: | echo "deb [trusted=yes] https://apt.fury.io/versionfox/ /" | sudo tee /etc/apt/sources.list.d/versionfox.list sudo apt-get update sudo apt-get install vfox - echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - - name: install vfox (MacOS) - if: runner.os == 'MacOS' - run: | - brew tap version-fox/tap - brew install vfox - echo 'eval "$(vfox activate bash)"' >> ~/.bashrc - echo 'eval "$(vfox activate zsh)"' >> ~/.zshrc + - name: Install packages + run: sudo apt-get update && sudo 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 - name: Generate PHP plugin run: | zip -r php.zip ./ - - name: Install packages - if: runner.os == 'Linux' - run: sudo apt-get update && sudo 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 - - name: Install packages - if: runner.os == 'MacOS' - run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib - - - name: Add PHP And Install Runtime + - name: Test run: | vfox add -s php.zip vfox install php@8.3.3 - - - - name: Test - run: | - vfox use php@8.3.3 + vfox use -p php@8.3.3 + eval "$(vfox activate bash)" php -v php -m composer -V - + diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml new file mode 100644 index 0000000..59836f4 --- /dev/null +++ b/.github/workflows/test-macos.yaml @@ -0,0 +1,41 @@ +name: Test unix workflow + +on: + pull_request: + # push: + schedule: + - cron: 0 0 * * 5 + +jobs: + plugin-test-linux: + strategy: + matrix: + # ref: https://github.com/actions/runner-images + os: [ macos-latest ] + runs-on: ${{ matrix.os }} + steps: + - name: install vfox (MacOS) + run: | + brew tap version-fox/tap + brew install vfox + + - name: Install packages + run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib + + - name: Generate PHP plugin + run: | + zip -r php.zip ./ + + - name: Test + shell: bash + run: | + vfox add -s php.zip + vfox install php@8.3.3 + vfox use -p php@8.3.3 + eval "$(vfox activate bash)" + php -v + php -m + composer -V + + + From 85a3ec7756705af341e8566607e7953a621f904a Mon Sep 17 00:00:00 2001 From: lihan Date: Wed, 10 Apr 2024 18:52:17 +0800 Subject: [PATCH 52/53] fix ci --- .github/workflows/test-linux.yaml | 2 +- .github/workflows/test-macos.yaml | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-linux.yaml b/.github/workflows/test-linux.yaml index 32490ea..08b993a 100644 --- a/.github/workflows/test-linux.yaml +++ b/.github/workflows/test-linux.yaml @@ -1,4 +1,4 @@ -name: Test unix workflow +name: Test linux workflow on: pull_request: diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml index 59836f4..564b74e 100644 --- a/.github/workflows/test-macos.yaml +++ b/.github/workflows/test-macos.yaml @@ -1,4 +1,4 @@ -name: Test unix workflow +name: Test macos workflow on: pull_request: @@ -7,25 +7,28 @@ on: - cron: 0 0 * * 5 jobs: - plugin-test-linux: + plugin-test-macos: strategy: matrix: # ref: https://github.com/actions/runner-images os: [ macos-latest ] runs-on: ${{ matrix.os }} steps: + - name: Checkout code + uses: actions/checkout@v3 - name: install vfox (MacOS) run: | brew tap version-fox/tap brew install vfox - - name: Install packages - run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib - - name: Generate PHP plugin run: | zip -r php.zip ./ + - name: Install packages + run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib + + - name: Test shell: bash run: | From 609a866a25591788ef9effc3e94f3b1415f15683 Mon Sep 17 00:00:00 2001 From: Chance Date: Wed, 10 Apr 2024 19:13:08 +0800 Subject: [PATCH 53/53] ci --- .github/workflows/test-linux.yaml | 10 ++++------ .github/workflows/test-macos.yaml | 12 ++++-------- .github/workflows/test-windows.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-linux.yaml b/.github/workflows/test-linux.yaml index 08b993a..1d1a8fe 100644 --- a/.github/workflows/test-linux.yaml +++ b/.github/workflows/test-linux.yaml @@ -2,7 +2,7 @@ name: Test linux workflow on: pull_request: - # push: + push: schedule: - cron: 0 0 * * 5 @@ -11,7 +11,7 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ ubuntu-latest ] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -32,11 +32,9 @@ jobs: - name: Test run: | vfox add -s php.zip - vfox install php@8.3.3 - vfox use -p php@8.3.3 + vfox install php@latest + vfox use -p php@$(vfox list php | sed -n 's/-> v//p') eval "$(vfox activate bash)" php -v php -m composer -V - - diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml index 564b74e..6cb2d60 100644 --- a/.github/workflows/test-macos.yaml +++ b/.github/workflows/test-macos.yaml @@ -2,7 +2,7 @@ name: Test macos workflow on: pull_request: - # push: + push: schedule: - cron: 0 0 * * 5 @@ -11,7 +11,7 @@ jobs: strategy: matrix: # ref: https://github.com/actions/runner-images - os: [ macos-latest ] + os: [macos-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -28,17 +28,13 @@ jobs: - name: Install packages run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib - - name: Test shell: bash run: | vfox add -s php.zip - vfox install php@8.3.3 - vfox use -p php@8.3.3 + vfox install php@latest + vfox use -p php@$(vfox list php | sed -n 's/-> v//p') eval "$(vfox activate bash)" php -v php -m composer -V - - - diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index ae475f6..bf2661e 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -2,7 +2,7 @@ name: Test windows workflow on: pull_request: - # push: + push: schedule: - cron: 0 0 * * 5 @@ -17,7 +17,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: install vfox and test(Windows) + - name: install vfox and test (Windows) shell: pwsh run: | Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser @@ -26,8 +26,8 @@ jobs: Compress-Archive -Path .\* -DestinationPath .\php.zip vfox -v vfox add -s php.zip - vfox install php@8.3.3 - vfox use -p php@8.3.3 + vfox install php@latest + vfox use -p php@$(vfox list php | sed -n 's/-> v//p') Invoke-Expression "$(vfox activate pwsh)" php -v php -m