chore: build choco inside build-os-packages script

Author: sevbch

.github/workflows/build_release_assets.yml

@@ -240,16 +240,6 @@ jobs:
           # automatically do it on Windows
           pdm run bash -c "scripts/build-os-packages/build-os-packages $args"
 
-      - name: Build Chocolatey package & test it
-        # About test part, cf https://docs.chocolatey.org/en-us/create/create-packages/#testing-your-package
-        if: startsWith(matrix.os, 'windows-')
-        shell: bash
-        run: |
-          windows_zip=$(find packages -maxdepth 1 -type f -name "*.zip" | grep "windows" | head -n 1)
-          scripts/chocolatey/pack $windows_zip packages
-          cd packages
-          choco install ggshield --debug --verbose --source . --noop
-
       - name: Override base Docker image used for functional tests on Windows
         if: matrix.os == 'windows-2022'
         # This is required because GitHub Windows runner is not configured to

scripts/build-os-packages/build-os-packages

@@ -320,11 +320,8 @@ step_create_archive() {
         info "Archive created in $pkg_path & $archive_path"
         ;;
     Windows)
-        archive_path="$PACKAGES_DIR/$ARCHIVE_DIR_NAME.zip"
-        pushd "$PACKAGES_DIR"
-        7z a "$archive_path" "$ARCHIVE_DIR_NAME"
-        popd
-        info "Archive created in $archive_path"
+        create_windows_packages
+        test_chocolatey_package
         ;;
     esac
 }

scripts/build-os-packages/windows-functions.bash

@@ -26,3 +26,43 @@ windows_sign() {
         --input "$archive_dir/$INSTALL_PREFIX/ggshield.exe"
 }
 
+windows_create_archive() {
+    local archive_path="$PACKAGES_DIR/$ARCHIVE_DIR_NAME.zip"
+    pushd "$PACKAGES_DIR"
+    7z a "$archive_path" "$ARCHIVE_DIR_NAME"
+    popd
+    #info "Archive created in $archive_path"
+}
+
+windows_build_chocolatey_package() {
+    # choco-package will contain everything needed to build the nupkg
+    # we delete it a the end.
+    mkdir choco-package
+    mkdir choco-package/tools
+
+    cp -r "$PACKAGES_DIR/$ARCHIVE_DIR_NAME/_internal" choco-package/tools
+    cp "$PACKAGES_DIR/$ARCHIVE_DIR_NAME/ggshield.exe" choco-package/tools
+    cp "$ROOT_DIR/scripts/chocolatey/ggshield.nuspec" choco-package
+    cp "$ROOT_DIR/scripts/chocolatey/VERIFICATION.txt" choco-package/tools
+    cp "$ROOT_DIR/LICENSE" choco-package/tools/LICENSE.txt
+    sed -i "s/__VERSION__/$VERSION/" choco-package/ggshield.nuspec
+
+    choco pack choco-package/* --version $VERSION --outdir $PACKAGES_DIR
+
+    #info "Chocolatey package created in $PACKAGES_DIR/ggshield.$VERSION.nupkg"
+
+    rm -rf choco-package
+    
+}
+
+# cf https://docs.chocolatey.org/en-us/create/create-packages/#testing-your-package
+test_chocolatey_package() {
+    pushd "$PACKAGES_DIR"
+    choco install ggshield --debug --verbose --source . --noop
+    popd
+}
+
+create_windows_packages() {
+    windows_create_archive
+    windows_build_chocolatey_package
+}