ci/windows: ensure that the Docker Image contains the packaging tools

Signed-off-by: Bindea Cristian <[email protected]>
analogdevicesinc · Sep 6, 2024 · dd730fe · dd730fe
1 parent 6842744
commit dd730fe
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/mingwbuild.yml b/.github/workflows/mingwbuild.yml
@@ -44,7 +44,7 @@ jobs:
                 -e GITHUB_RUN_NUMBER=%GITHUB_RUN_NUMBER% ^
                 -e RUNNER_ARCH=%RUNNER_ARCH% ^
                 -e CI_SCRIPT=ON ^
-                cristianbindea/scopy2-mingw64:testing C:\msys64\usr\bin\bash.exe -c '/home/docker/scopy/ci/windows/build_and_create_installer.sh'
+                cristianbindea/scopy2-mingw64:testing C:\msys64\usr\bin\bash.exe -c '/home/docker/scopy/ci/windows/build_and_create_installer.sh run_workflow'
 
     - name: Set short git commit SHA
       shell: bash

diff --git a/ci/windows/.dockerignore b/ci/windows/.dockerignore
@@ -1,4 +1,5 @@
 *
+!build_and_create_installer.sh
 !mingw_toolchain.sh
 !windows_build_process.sh
 !sigrokdecode-windows-fix.patch
diff --git a/ci/windows/build_and_create_installer.sh b/ci/windows/build_and_create_installer.sh
@@ -26,7 +26,6 @@ DEBUG_FOLDER=$ARTIFACT_FOLDER/debug-$ARCH
 PYTHON_FILES=$STAGING_DIR/lib/python3.*
 DLL_DEPS=$(cat $SRC_FOLDER/ci/windows/mingw_dll_deps)
 EMU_BUILD_FOLDER=$WORKDIR/iio-emu/build
-STAGING_AREA=$SRC_FOLDER/ci/windows/staging
 REGMAP_XMLS=$BUILD_FOLDER/plugins/plugins/regmap/xmls
 
 # Generate build status info for the about page
@@ -170,18 +169,27 @@ create_installer() {
 	popd
 }
 
+# move the staging folder that contains the tools needed for the build to the known location
+move_tools(){
+	[ -d /home/docker/staging ] && mv /home/docker/staging $STAGING_AREA || echo "Staging folder not found or already moved"
+	if [ ! -d $STAGING_AREA ]; then
+		echo "Missing tools folder, downloading now"
+		download_tools
+	fi
+}
+
+
 run_workflow(){
-	download_tools
+	[ "$CI_SCRIPT" == "ON" ] && move_tools || download_tools
 	build_scopy
 	build_iio-emu
-	download_tools
 	deploy_app
 	bundle_drivers
 	extract_debug_symbols
 	create_installer
 }
 
-run_workflow
+# run_workflow
 
 for arg in $@; do
 	$arg

diff --git a/ci/windows/docker/Dockerfile b/ci/windows/docker/Dockerfile
@@ -31,6 +31,7 @@ WORKDIR C:\\msys64\\home\\docker
 
 COPY mingw_toolchain.sh C:/msys64/home/docker/scripts/mingw_toolchain.sh
 COPY windows_build_process.sh C:/msys64/home/docker/scripts/windows_build_process.sh
+COPY build_and_create_installer.sh C:/msys64/home/docker/scripts/build_and_create_installer.sh
 COPY sigrokdecode-windows-fix.patch C:/msys64/home/docker/scripts/sigrokdecode-windows-fix.patch
 
 RUN C:\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syyu" & \
@@ -39,5 +40,7 @@ RUN C:\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syyu" & \
     C:\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu" & \
     C:\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu" & \
     C:\msys64\usr\bin\bash.exe -lc "C:/msys64/home/docker/scripts/windows_build_process.sh" & \
+    C:\msys64\usr\bin\bash.exe -lc "C:/msys64/home/docker/scripts/build_and_create_installer.sh download_tools" & \
+    C:\msys64\usr\bin\bash.exe -lc "mv C:/msys64/home/docker/scripts/staging C:/msys64/home/docker/staging" & \
     C:\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Scc " & \
     rmdir /s /q C:\msys64\home\docker\scripts
diff --git a/ci/windows/mingw_toolchain.sh b/ci/windows/mingw_toolchain.sh
@@ -21,9 +21,9 @@ QWT_BRANCH=qwt-multiaxes-updated
 LIBTINYIIOD_BRANCH=master
 IIOEMU_BRANCH=master
 
+STAGING_AREA=$WORKFOLDER/staging
 MINGW_VERSION=mingw64
 ARCH=x86_64
-STAGING_AREA=$WORKFOLDER/staging
 
 USE_STAGING=$1
 if [ ! -z "$USE_STAGING" ] && [ "$USE_STAGING" == "ON" ]