From 2904d4497767137741b2f5703336f3009d3abc70 Mon Sep 17 00:00:00 2001 From: Canming Huang Date: Fri, 8 Mar 2024 11:22:55 -0500 Subject: [PATCH] update docker_build script for rhel nuget package build --- platforms/rhel/9/docker_build/docker_build | 6 ++++-- platforms/rhel/9/docker_build/docker_build.bat | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platforms/rhel/9/docker_build/docker_build b/platforms/rhel/9/docker_build/docker_build index 0968877c4..6f3094363 100755 --- a/platforms/rhel/9/docker_build/docker_build +++ b/platforms/rhel/9/docker_build/docker_build @@ -5,8 +5,10 @@ rm -rf package/*.nupkg docker build -t emgu/emgucv-ubi-build-nuget . GIT_HEAD_HASH=$(git rev-parse HEAD) -echo %GIT_HEAD_HASH% +echo $GIT_HEAD_HASH +GIT_HEAD_BRANCH=$(git rev-parse --abbrev-ref HEAD) +echo $GIT_HEAD_BRANCH -docker run --mount type=bind,source=$(pwd)/package,target=/package emgu/emgucv-ubi-build-nuget:latest bash -c "cd emgucv;git fetch;git reset --hard %GIT_HEAD_HASH%;git submodule update --init --recursive;cd platforms/rhel/9;./cmake_configure;cd build;make;cp /emgucv/platforms/nuget/*.nupkg /package/" +docker run --mount type=bind,source=$(pwd)/package,target=/package emgu/emgucv-ubi-build-nuget:latest bash -c "cd emgucv;git fetch;git checkout $GIT_HEAD_BRANCH;git pull;git log -n 5;git checkout $GIT_HEAD_HASH;git submodule update --init --recursive;cd platforms/rhel/9;./cmake_configure;cd build;make;cp /emgucv/platforms/nuget/*.nupkg /package/" cp package/*.nupkg ../../../nuget/ diff --git a/platforms/rhel/9/docker_build/docker_build.bat b/platforms/rhel/9/docker_build/docker_build.bat index 9f0a41de8..290bde3ac 100644 --- a/platforms/rhel/9/docker_build/docker_build.bat +++ b/platforms/rhel/9/docker_build/docker_build.bat @@ -7,6 +7,6 @@ SET GIT_HEAD_HASH=%%F ) ECHO %GIT_HEAD_HASH% -docker run --mount type=bind,source=%cd%\package,target=/package emgu/emgucv-ubi-build-nuget:latest bash -c "cd emgucv;git fetch;git reset --hard %GIT_HEAD_HASH%;git submodule update --init --recursive;cd platforms/rhel/9;./cmake_configure;cd build;make;cp /emgucv/platforms/nuget/*.nupkg /package/" +docker run --mount type=bind,source=%cd%\package,target=/package emgu/emgucv-ubi-build-nuget:latest bash -c "cd emgucv;git fetch;git checkout %GIT_HEAD_HASH%;git submodule update --init --recursive;cd platforms/rhel/9;./cmake_configure;cd build;make;cp /emgucv/platforms/nuget/*.nupkg /package/" cp package/*.nupkg ../../../nuget/