Override iconv version when building it from git (#68)

* Override iconv version when building it from git

* Send to signpath only the files that may be signed

Author: mlocati

.github/workflows/build.yml

@@ -116,6 +116,7 @@ jobs:
       cygwin-mirror: ${{ steps.resolve.outputs.cygwin-mirror }}
       cldr-version: ${{ steps.resolve.outputs.cldr-version }}
       iconv-version: ${{ steps.resolve.outputs.iconv-version }}
+      iconv-version-base: ${{ steps.resolve.outputs.iconv-version-base }}
       iconv-tarball-from-commit: ${{ steps.resolve.outputs.iconv-tarball-from-commit }}
       iconv-source-url: ${{ steps.resolve.outputs.iconv-source-url }}
       curl-version: ${{ steps.resolve.outputs.curl-version }}
@@ -204,7 +205,7 @@ jobs:
         name: Build tarball
         if: needs.versions.outputs.iconv-tarball-from-commit
         working-directory: libiconv
-        run: make dist
+        run: make dist VERSION=${{ needs.versions.outputs.iconv-version }}
       -
         name: Upload tarball
         if: needs.versions.outputs.iconv-tarball-from-commit
@@ -592,7 +593,9 @@ jobs:
         uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.link }}-${{ matrix.bits }}-installed-unsigned
-          path: installed
+          path: |
+            installed/**/*.dll
+            installed/**/*.exe
           if-no-files-found: error
           retention-days: 1
       -
@@ -628,7 +631,7 @@ jobs:
         shell: pwsh
         working-directory: output-dev
         run: |
-          & 7z.exe a -bd -bt -mx9 -r -sse -tzip ..\assets\gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version }}-${{ matrix.link }}-${{ matrix.bits }}-dev-gcc.zip
+          & 7z.exe a -bd -bt -mx9 -r -sse -tzip ..\assets\gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version-base }}-${{ matrix.link }}-${{ matrix.bits }}-dev-gcc.zip
       -
         name: Copy built executables
         shell: pwsh
@@ -642,7 +645,7 @@ jobs:
         shell: pwsh
         working-directory: output-exe
         run: |
-          & 7z.exe a -bd -bt -mx9 -r -sse -tzip ..\assets\gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version }}-${{ matrix.link }}-${{ matrix.bits }}.zip
+          & 7z.exe a -bd -bt -mx9 -r -sse -tzip ..\assets\gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version-base }}-${{ matrix.link }}-${{ matrix.bits }}.zip
       -
         name: Prepare build log
         id: prepare-build-log
@@ -790,19 +793,19 @@ jobs:
           -Link ${{ matrix.link }}
           -SourceDirectory output-exe
           -OutputDirectory assets
-          -IconvVersion ${{ needs.versions.outputs.iconv-version }}
+          -IconvVersion ${{ needs.versions.outputs.iconv-version-base }}
           -GettextVersion ${{ needs.versions.outputs.gettext-version }}
       -
         name: Check bitness
-        run: ./build-exe/check-bits.sh 32 assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version }}-${{ matrix.link }}-${{ matrix.bits }}.exe
+        run: ./build-exe/check-bits.sh 32 assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version-base }}-${{ matrix.link }}-${{ matrix.bits }}.exe
       -
         name: Upload unsigned installer
         if: needs.versions.outputs.signpath-signing-policy
         id: upload-installer-unsigned
         uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.link }}-${{ matrix.bits }}-installer-unsigned
-          path: assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version }}-${{ matrix.link }}-${{ matrix.bits }}.exe
+          path: assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version-base }}-${{ matrix.link }}-${{ matrix.bits }}.exe
           if-no-files-found: error
           compression-level: 0
           retention-days: 1
@@ -827,7 +830,7 @@ jobs:
         run: >
           ./build-exe/check-signature.ps1
           -GettextVersion ${{ needs.versions.outputs.gettext-version }}
-          -Path assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version }}-${{ matrix.link }}-${{ matrix.bits }}.exe
+          -Path assets/gettext${{ needs.versions.outputs.gettext-version }}-iconv${{ needs.versions.outputs.iconv-version-base }}-${{ matrix.link }}-${{ matrix.bits }}.exe
           -CanBeInvalid ${{ needs.versions.outputs.signatures-canbeinvalid == 'yes' && '$true' || '$false'  }}
       -
         name: Upload assets

build-exe/resolve-versions.ps1

@@ -163,9 +163,12 @@ if ($IconvVersion) {
 } else {
     $IconvVersion = '1.18'
 }
+$IconvVersionBase = $IconvVersion
 $IconvTarballFromCommit = ''
-if ((Compare-Versions $IconvVersion '1.18') -eq 0) {
+$vo = ConvertTo-VersionObject $IconvVersion
+if ((Compare-Versions $vo '1.18') -eq 0) {
     $IconvTarballFromCommit = '30fc26493e4c6457000172d49b526be0919e34c6'
+    $IconvVersion = "$($vo.Major).$($vo.Minor).$($vo.Build).$((Get-Date).ToUniversalTime().ToString("yyyyMMdd"))"
 }
 
 if ($GettextVersion) {
@@ -307,6 +310,7 @@ if ((Compare-Versions $GettextVersion '1.0') -ge 0) {
 Add-GithubOutput -Name 'cygwin-mirror' -Value $cygwinMirror
 Add-GithubOutput -Name 'cldr-version' -Value $CLDRVersion
 Add-GithubOutput -Name 'iconv-version' -Value $IconvVersion
+Add-GithubOutput -Name 'iconv-version-base' -Value $IconvVersionBase
 Add-GithubOutput -Name 'iconv-tarball-from-commit' -Value $IconvTarballFromCommit
 Add-GithubOutput -Name 'iconv-source-url' -Value $iconvSourceUrl
 Add-GithubOutput -Name 'curl-version' -Value $CurlVersion