Skip to content

Commit

Permalink
build: Update Windows MSI packing building process
Browse files Browse the repository at this point in the history
Also build external libs, all updated to latest versions
with the most possible updated gcc toolchain
  • Loading branch information
g-bougard committed Mar 4, 2024
1 parent 064d784 commit 0193386
Show file tree
Hide file tree
Showing 7 changed files with 976 additions and 83 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/glpi-agent-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,19 +189,31 @@ jobs:
- uses: actions/checkout@v4
- name: Create folders for cached datas
run: |
mkdir C:\Strawberry-perl-for-GLPI-Agent_build\download
mkdir C:\Strawberry-perl-for-GLPI-Agent_build\restore
mkdir C:\Strawberry-perl-for-GLPI-Agent_build\tools
shell: cmd
- name: Restore points cache
uses: actions/cache@v4
id: built-perl-cache
with:
path: |
C:/Strawberry-perl-for-GLPI-Agent_build/tools
C:/Strawberry-perl-for-GLPI-Agent_build/restore
key: windows-packaging-cache-${{ matrix.arch }}-${{ hashFiles('contrib\windows\glpi-agent-packaging.pl', 'contrib\windows\packaging\*') }}
key: windows-packaging-cache-${{ matrix.arch }}-${{ hashFiles('contrib\windows\glpi-agent-extlibs-build.pl', 'contrib\windows\glpi-agent-packaging.pl', 'contrib\windows\packaging\*') }}
- name: Restore Toolchain points cache
uses: actions/cache@v4
id: built-extlibs-cache
if: ${{ steps.built-perl-cache.outputs.cache-hit != 'true' }}
with:
path: |
C:/Strawberry-perl-for-GLPI-Agent_build/download/winlibs*.zip
C:/Strawberry-perl-for-GLPI-Agent_build/download/extlibs.zip
key: windows-packaging-extlibs-cache-${{ matrix.arch }}-${{ hashFiles('contrib\windows\glpi-agent-extlibs-build.pl', 'contrib\windows\packaging\ToolchainBuildJob.pm', 'contrib\windows\packaging\*.patch') }}
- name: List files in cached paths
if: success() || failure()
run: |
dir C:\Strawberry-perl-for-GLPI-Agent_build\download
dir C:\Strawberry-perl-for-GLPI-Agent_build\restore
dir C:\Strawberry-perl-for-GLPI-Agent_build\tools
shell: cmd
Expand All @@ -227,6 +239,11 @@ jobs:
run: |
cpanm --notest --verbose https://github.com/StrawberryPerl/Perl-Dist-Strawberry.git
shell: cmd
- name: Build Extlibs with Perl Toolchain
if: ${{ steps.built-perl-cache.outputs.cache-hit != 'true' && steps.built-extlibs-cache.outputs.cache-hit != 'true' }}
run: |
perl contrib\windows\glpi-agent-extlibs-build.pl --arch ${{ matrix.arch }}
shell: cmd
- name: Build package
run: |
perl contrib\windows\glpi-agent-packaging.pl --arch ${{ matrix.arch }}
Expand Down
10 changes: 9 additions & 1 deletion Changes
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,15 @@ toolbox:

packaging:
* Update MacOSX to use perl 5.38.2, OpenSSL 3.2.1 and zlib 1.3.1
* Update Windows MSI installer to use StrawBerry Perl 5.38.2
* Update Windows MSI packing building process to use:
- gcc 13.2.0posix-17.0.6-11.0.1-msvcrt-r5
- msys2-base 20240113
- zlib 1.3.1
- OpenSSL 3.2.1
- libssh2 1.11.0
- xz 5.6.0
- libxml2 2.12.5
- StrawBerry Perl 5.38.2
* Windows MSI installer is only provided for x64

1.7.1 Fri, 22 Dec 2023
Expand Down
Loading

0 comments on commit 0193386

Please sign in to comment.