Skip to content

Commit e12a83f

Browse files
committed
ci(version): inject FRANKENPHP_VERSION as per-step env instead of GITHUB_ENV
1 parent cb293eb commit e12a83f

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/static.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,11 @@ jobs:
457457
uses: ./.github/actions/version
458458
with:
459459
ref: ${{ needs.prepare.outputs.ref }}
460-
- name: Set FRANKENPHP_VERSION
461-
run: echo "FRANKENPHP_VERSION=${VERSION}" >> "${GITHUB_ENV}"
462-
env:
463-
VERSION: ${{ steps.version.outputs.version }}
464460
- name: Build FrankenPHP
465461
run: ./build-static.sh
466462
env:
467463
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
464+
FRANKENPHP_VERSION: ${{ steps.version.outputs.version }}
468465
RELEASE: ${{ (needs.prepare.outputs.ref || github.ref_type == 'tag') && '1' || '' }}
469466
NO_COMPRESS: ${{ github.event_name == 'pull_request' && '1' || '' }}
470467
- name: Upload logs

.github/workflows/windows.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ jobs:
7373
uses: ./frankenphp/.github/actions/version
7474
with:
7575
ref: ${{ env.REF }}
76-
- name: Set FRANKENPHP_VERSION
77-
shell: bash
78-
run: echo "FRANKENPHP_VERSION=${VERSION}" >> "${GITHUB_ENV}"
79-
env:
80-
VERSION: ${{ steps.version.outputs.version }}
8176

8277
- name: Setup Go
8378
uses: ./frankenphp/.github/actions/setup-go
@@ -141,6 +136,8 @@ jobs:
141136
142137
"CGO_CFLAGS=-DFRANKENPHP_VERSION=$env:FRANKENPHP_VERSION -I$vcpkgRoot\include -I$watcherRoot -I$phpDevel\include -I$phpDevel\include\main -I$phpDevel\include\TSRM -I$phpDevel\include\Zend -I$phpDevel\include\ext" >> $env:GITHUB_ENV
143138
"CGO_LDFLAGS=-L$vcpkgRoot\lib -lbrotlienc -L$watcherRoot -llibwatcher-c -L$phpBin -L$phpDevel\lib -lphp8ts -lphp8embed" >> $env:GITHUB_ENV
139+
env:
140+
FRANKENPHP_VERSION: ${{ steps.version.outputs.version }}
144141

145142
- name: Embed Windows icon and metadata
146143
working-directory: frankenphp\caddy\frankenphp
@@ -177,12 +174,16 @@ jobs:
177174
$json | Set-Content "versioninfo.json"
178175
179176
goversioninfo -64 -icon ..\..\frankenphp.ico versioninfo.json -o resource.syso
177+
env:
178+
FRANKENPHP_VERSION: ${{ steps.version.outputs.version }}
180179

181180
- name: Build FrankenPHP
182181
run: |
183182
$customVersion = "FrankenPHP $env:FRANKENPHP_VERSION PHP $env:PHP_VERSION Caddy"
184183
go build -ldflags="-extldflags=-fuse-ld=lld -X 'github.com/caddyserver/caddy/v2.CustomVersion=$customVersion' -X 'github.com/caddyserver/caddy/v2.CustomBinaryName=frankenphp' -X 'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy'"
185184
working-directory: frankenphp\caddy\frankenphp
185+
env:
186+
FRANKENPHP_VERSION: ${{ steps.version.outputs.version }}
186187

187188
- name: Create Directory
188189
run: |

0 commit comments

Comments
 (0)