Skip to content

Commit e8af92f

Browse files
committed
:octocat: reduce the amount of fires 🔥
1 parent 274e300 commit e8af92f

File tree

2 files changed

+9
-31
lines changed

2 files changed

+9
-31
lines changed

.github/workflows/windows-php7.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
php: ["7.4", "7.3", "7.2", "7.1", "7.0"]
22-
arch: ["x64", "x86"]
23-
ts: ["ts", "nts"]
22+
arch: ["x64"] # , "x86"
23+
ts: ["ts"] # , "nts"
2424

2525
runs-on: windows-2019
2626

@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v3
3030

3131
- name: "Install PHP SDK ${{ matrix.php}}"
32-
uses: codemasher/setup-php-sdk@file-split
32+
uses: codemasher/setup-php-sdk@split-file
3333
id: sdk
3434
with:
3535
version: ${{matrix.php}}
@@ -54,17 +54,6 @@ jobs:
5454
- name: "test"
5555
run: nmake test
5656

57-
# this works but is there a proper windows (cmd) way?
58-
- name: "Determine filename prefix"
59-
shell: bash
60-
run: |
61-
if ${{contains(github.ref_type, 'tag')}} == true; then
62-
REF=${{github.ref_name}}
63-
else
64-
REF=${GITHUB_SHA:0:7}
65-
fi
66-
echo "file_tag=${REF}-${{matrix.php}}-${{matrix.ts}}-${{steps.sdk.outputs.vs}}-${{matrix.arch}}" >> $GITHUB_ENV
67-
6857
- name: "Package"
6958
run: |
7059
if exist x64 (
@@ -73,7 +62,7 @@ jobs:
7362
if exist Release (set prefix=Release) else (set prefix=Release_TS)
7463
)
7564
md .artifact
76-
copy %prefix%\php_xz.dll .artifact\php_xz-${{env.file_tag}}.dll
65+
copy %prefix%\php_xz.dll .artifact\php_xz-${{steps.sdk.outputs.file_tag}}.dll
7766
7867
- name: "Upload artifacts"
7968
uses: actions/upload-artifact@v3
@@ -86,4 +75,4 @@ jobs:
8675
uses: softprops/action-gh-release@v1
8776
if: contains(github.ref_type, 'tag')
8877
with:
89-
files: .artifact\php_xz-${{env.file_tag}}.dll
78+
files: .artifact\php_xz-${{steps.sdk.outputs.file_tag}}.dll

.github/workflows/windows-php8.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
php: ["8.2", "8.1", "8.0"]
23-
arch: ["x64" , "x86"]
23+
arch: ["x64"] #, "x86"
2424
ts: ["ts", "nts"]
2525

2626
runs-on: windows-2022
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/checkout@v3
3131

3232
- name: "Install PHP SDK ${{matrix.php}}"
33-
uses: codemasher/setup-php-sdk@file-split
33+
uses: codemasher/setup-php-sdk@split-file
3434
id: sdk
3535
with:
3636
version: ${{matrix.php}}
@@ -50,17 +50,6 @@ jobs:
5050
- name: "test"
5151
run: nmake test
5252

53-
# this works but is there a proper windows (cmd) way? setting env vars seems messy/broken in cmd
54-
- name: "Determine filename tag"
55-
shell: bash
56-
run: |
57-
if ${{contains(github.ref_type, 'tag')}} == true; then
58-
REF=${{github.ref_name}}
59-
else
60-
REF=${GITHUB_SHA:0:7}
61-
fi
62-
echo "file_tag=${REF}-${{matrix.php}}-${{matrix.ts}}-${{steps.sdk.outputs.vs}}-${{matrix.arch}}" >> $GITHUB_ENV
63-
6453
- name: "Package"
6554
run: |
6655
if exist x64 (
@@ -69,7 +58,7 @@ jobs:
6958
if exist Release (set prefix=Release) else (set prefix=Release_TS)
7059
)
7160
md .artifact
72-
copy %prefix%\php_xz.dll .artifact\php_xz-${{env.file_tag}}.dll
61+
copy %prefix%\php_xz.dll .artifact\php_xz-${{steps.sdk.outputs.file_tag}}.dll
7362
7463
- name: "Upload artifacts"
7564
uses: actions/upload-artifact@v3
@@ -82,4 +71,4 @@ jobs:
8271
uses: softprops/action-gh-release@v1
8372
if: contains(github.ref_type, 'tag')
8473
with:
85-
files: .artifact\php_xz-${{env.file_tag}}.dll
74+
files: .artifact\php_xz-${{steps.sdk.outputs.file_tag}}.dll

0 commit comments

Comments
 (0)