Skip to content

Fix windows builds and PIE composer.json tweaks #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix windows builds and PIE composer.json tweaks #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dbe261
Fix Windows build failures
asgrim Jan 20, 2025
be79e3a
Propose additions for PIE composer.json
asgrim Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,27 @@ on:

jobs:
windows:
runs-on: windows-latest
runs-on: ${{matrix.os}}
name: "Windows: Build and test"
defaults:
run:
shell: cmd
strategy:
fail-fast: false
matrix:
php: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
os: [ windows-2019, windows-2022 ]
php: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3","8.4"]
arch: [x86, x64]
ts: [nts, ts]
experimental: [false]
exclude:
- { os: windows-2019, php: "8.4" }
- { os: windows-2019, php: "8.3" }
- { os: windows-2019, php: "8.2" }
- { os: windows-2019, php: "8.1" }
- { os: windows-2019, php: "8.0" }
- { os: windows-2022, php: "7.4" }
- { os: windows-2022, php: "7.3" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to just spell out all the right combinations instead of the wrong ones?

steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand All @@ -36,11 +45,12 @@ jobs:
echo $extension_version >> $env:GITHUB_ENV
- name: Setup PHP
id: setup-php
uses: php/setup-php-sdk@v0.8
uses: php/setup-php-sdk@v0.10
with:
version: ${{matrix.php}}
arch: ${{matrix.arch}}
ts: ${{matrix.ts}}
cache: true
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
with:
Expand Down Expand Up @@ -70,6 +80,8 @@ jobs:
if ('8.0' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
if ('8.1' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
if ('8.2' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
if ('8.3' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
if ('8.4' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs17' }

if ('nts' -eq '${{matrix.ts}}') { $artifact_name = $artifact_name + '-nts' }
if ('x64' -eq '${{matrix.arch}}') { $artifact_name = $artifact_name + '-x86_64' }
Expand Down
8 changes: 7 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
"php": ">=5.4"
},
"php-ext": {
"extension-name": "timezonedb",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extension name is not strictly required, since the package name is already correct, but it may help to be explicit.

"priority": 20,
"configure-options": []
"configure-options": [
{
"name": "enable-timezonedb",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This --enable-timezonedb option is defined in config.m4 so it should be possible to provide this in the configure-options when using PIE

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it is pointless. Using it is the default, doing --disable-timezonedb makes the extension not work.

"description": "Enable timezonedb support"
}
]
}
}