Skip to content

Commit 0773936

Browse files
committed
Fix artifacts upload step
1 parent 97232ba commit 0773936

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/actions/build-win/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runs:
2929
- name: Install PHP PowerShell Manager
3030
shell: powershell
3131
run: |
32-
Write-Output "Install PowerShell PHP Manager module"
32+
Write-Output "::group::Install PowerShell PHP Manager module"
3333
if (Get-Module -ListAvailable -Name PhpManager) {
3434
Write-Host "PhpManager powershell module exist, skip install"
3535
} else {
@@ -91,7 +91,6 @@ runs:
9191
- name: Enable Zephir Parser
9292
shell: powershell
9393
run: |
94-
$OsName = "${{ matrix.os }}".replace('-','').ToLower()
9594
$ReleaseFolder = if ("${{ inputs.ts }}" -eq "ts") { "Release_TS" } else { "Release" }
9695
$ReleaseFolder = if ("${{ inputs.arch }}" -eq "x64") { "x64\${ReleaseFolder}" } else { "${ReleaseFolder}" }
9796
$ReleaseDllPath = "${{ github.workspace }}\${ReleaseFolder}\php_zephir_parser.dll"

.github/workflows/ci.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,26 @@ jobs:
106106
NO_INTERACTION: 1
107107
REPORT_EXIT_STATUS: 1
108108

109-
- name: Prepare Build Artifacts
110-
working-directory: modules
109+
- name: Collect Build Artifacts
110+
shell: bash
111111
run: |
112-
echo "-- Creating ZIP with Zephir Parser extension"
113-
zip -rv zephir-parser-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}-${{ matrix.arch }}.zip ./*.so
112+
echo "::group::Creating ZIP with Zephir Parser extension"
113+
if [ "${{ runner.os }}" = "Windows" ]; then
114+
EXTENSION="$(find .\x64 -type f -name 'php_zephir_parser.dll')"
115+
else
116+
EXTENSION="$(find ./modules -type f -name 'zephir_parser.so')"
117+
fi
118+
119+
zip -rvj zephir-parser-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}-${{ matrix.arch }}.zip \
120+
$EXTENSION VERSION LICENSE CREDITS NO_WARRANTY CHANGELOG.md
121+
echo "::endgroup::"
114122
115123
- name: Upload Zephir Parser
116124
uses: actions/upload-artifact@v2
117125
with:
118126
name: zephir-parser-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}-${{ matrix.arch }}.zip
119127
path: |
120-
${{ github.workspace }}/modules/*.zip
128+
${{ github.workspace }}/zephir-parser-*.zip
121129
122130
release:
123131
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')

0 commit comments

Comments
 (0)