From 4827074595db2e3e1d9b43797f17c435c0bc4310 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 5 Nov 2024 12:08:38 +0100 Subject: [PATCH 1/3] Don't install into hidden folder The actions/upload-artifacts@v4 ignores hidden folders (unless explicitly told not to), and there is no need for that. Instead we install into a folder outside of the sources. --- .github/workflows/windows.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 17d065a..1f3683d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -52,20 +52,20 @@ jobs: run: nmake test TESTS="--show-diff tests" - name: package run: | - md .install - copy LICENSE .install - copy README.md .install + md ..\install + copy LICENSE ..\install + copy README.md ..\install if exist x64 ( if exist x64\Release (set prefix=x64\Release) else set prefix=x64\Release_TS ) else ( if exist Release (set prefix=Release) else set prefix=Release_TS ) - copy %prefix%\php_parallel.dll .install - copy %prefix%\php_parallel.pdb .install - copy ..\deps\COPYING .install\COPYING.PTHREADS - copy ..\deps\bin\* .install + copy %prefix%\php_parallel.dll ..\install + copy %prefix%\php_parallel.pdb ..\install + copy ..\deps\COPYING ..\install\COPYING.PTHREADS + copy ..\deps\bin\* ..\install - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: parallel-${{matrix.version}} - path: .install + path: ..\install From cf7d8b331e87f0c59f49a160c28b3d96de440bfe Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 5 Nov 2024 12:10:48 +0100 Subject: [PATCH 2/3] Update to setup-php-sdk v0.10 and enable caching The latter should bring a considerable performance improvement. --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1f3683d..975614f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,11 +28,12 @@ jobs: uses: actions/checkout@v4 - name: Setup PHP id: setup-php - uses: php/setup-php-sdk@v0.9 + uses: php/setup-php-sdk@v0.10 with: version: ${{matrix.version}} arch: ${{matrix.arch}} ts: ${{matrix.ts}} + cache: true - name: Fetch dependencies run: | curl -LO https://downloads.php.net/~windows/pecl/deps/pthreads-3.0.0-vs16-${{matrix.arch}}.zip From 5aee2921cf43480572bf97155ac11741ef39fcf5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 5 Nov 2024 12:25:57 +0100 Subject: [PATCH 3/3] Install to folder inside checkout The upload action is picky about "relative paths", so we work around. --- .github/workflows/windows.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 975614f..68b35d1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -53,20 +53,20 @@ jobs: run: nmake test TESTS="--show-diff tests" - name: package run: | - md ..\install - copy LICENSE ..\install - copy README.md ..\install + md win-install + copy LICENSE win-install + copy README.md win-install if exist x64 ( if exist x64\Release (set prefix=x64\Release) else set prefix=x64\Release_TS ) else ( if exist Release (set prefix=Release) else set prefix=Release_TS ) - copy %prefix%\php_parallel.dll ..\install - copy %prefix%\php_parallel.pdb ..\install - copy ..\deps\COPYING ..\install\COPYING.PTHREADS - copy ..\deps\bin\* ..\install + copy %prefix%\php_parallel.dll win-install + copy %prefix%\php_parallel.pdb win-install + copy ..\deps\COPYING win-install\COPYING.PTHREADS + copy ..\deps\bin\* win-install - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: parallel-${{matrix.version}} - path: ..\install + path: win-install