Skip to content

Commit

Permalink
ci/windows: update windows scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Bindea Cristian <cristian.bindea@analog.com>
  • Loading branch information
bindea-cristian committed Jun 25, 2024
1 parent 0d0184b commit bbc0f20
Show file tree
Hide file tree
Showing 6 changed files with 439 additions and 403 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mingwbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
-e GITHUB_RUN_NUMBER=%GITHUB_RUN_NUMBER% ^
-e RUNNER_ARCH=%RUNNER_ARCH% ^
-e CI_SCRIPT=ON ^
cristianbindea/scopy2-mingw64:latest C:\msys64\usr\bin\bash.exe -c '/home/docker/scopy/ci/windows/build_and_create_installer.sh'
cristianbindea/scopy2-mingw64:latest 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
Expand Down
341 changes: 0 additions & 341 deletions ci/windows/build.sh

This file was deleted.

29 changes: 19 additions & 10 deletions ci/windows/build_and_create_installer.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ fi

BUILD_TARGET=x86_64
ARCH_BIT=64
TOOLS_FOLDER=$WORKDIR/scopy-mingw-build-deps
pushd $TOOLS_FOLDER
source ./mingw_toolchain.sh $BUILD_TARGET OFF # USING_STAGING = OFF
popd

## Set STAGING
USE_STAGING=OFF
##

source $SRC_FOLDER/ci/windows/mingw_toolchain.sh $USE_STAGING

export DEST_FOLDER=$WORKDIR/scopy_$ARCH
BUILD_FOLDER=$WORKDIR/build_$ARCH
Expand Down Expand Up @@ -151,9 +153,16 @@ create_installer() {
ls -la $SRC_FOLDER
}

build_scopy
build_iio-emu
deploy_app
bundle_drivers
extract_debug_symbols
create_installer

run_workflow(){
build_scopy
build_iio-emu
deploy_app
bundle_drivers
extract_debug_symbols
create_installer
}

for arg in $@; do
$arg
done
Loading

0 comments on commit bbc0f20

Please sign in to comment.