From 659169f343704474f09c6ab601e351abed528ea1 Mon Sep 17 00:00:00 2001 From: Saeed Date: Wed, 18 Dec 2024 21:16:19 -0700 Subject: [PATCH 1/3] add a new argument to the buildpkg.pl to set the ultrascan branch --- admin/release/buildpkg.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/admin/release/buildpkg.pl b/admin/release/buildpkg.pl index 8e6306038..ba1cb9edd 100755 --- a/admin/release/buildpkg.pl +++ b/admin/release/buildpkg.pl @@ -21,14 +21,16 @@ $snames = join( "\n", keys %supported ); -$notes = "usage: $0 cores name +$notes = "usage: $0 cores name [branch] where cores is the number of cores to use for parallel compilation -where name one of +where name is one of $snames +where branch is the ultrascan branch (default: master) + what it does: builds a container using podman if available of if not tries docker @@ -40,6 +42,7 @@ $cores = shift || die $notes; $image = shift || die $notes; +$branch = shift || "master"; # find a container manager @@ -60,7 +63,7 @@ $cmd = "cd $from" - . " && unbuffer $docker build -t $name --build-arg image=$bimage --build-arg apt_python_version=$supported{$image} --build-arg parallel_compile=$cores ." + . " && unbuffer $docker build -t $name --build-arg image=$bimage --build-arg apt_python_version=$supported{$image} --build-arg parallel_compile=$cores --build-arg ultrascan_branch=$branch ." . " && id=\$($docker create $name)" . " && $docker cp \$id:lastpkgname ../last.$name" . " && $docker cp \$id:`cat ../last.$name` .." @@ -71,11 +74,10 @@ $|=1; print "-"x80 . "\n"; -print "building release package for $bimage using $cores cores\n"; +print "building release package for $bimage using $cores cores and branch $branch\n"; print "-"x80 . "\n"; print "$cmd\n"; print "-"x80 . "\n"; print `$cmd\n`; print "-"x80 . "\n"; - From 276f9348a5168d4923de832250329289bfe010c9 Mon Sep 17 00:00:00 2001 From: Saeed Date: Wed, 18 Dec 2024 21:21:42 -0700 Subject: [PATCH 2/3] edit the redhat and ubuntu dockerfiles to make sure that it checkouts the right branch --- admin/release/redhat/Dockerfile | 3 +++ admin/release/ubuntu/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/admin/release/redhat/Dockerfile b/admin/release/redhat/Dockerfile index a62e97172..5e1d1db18 100644 --- a/admin/release/redhat/Dockerfile +++ b/admin/release/redhat/Dockerfile @@ -96,6 +96,9 @@ RUN wget https://versaweb.dl.sourceforge.net/project/qwt/qwt/$qwt_version/qwt-$q ## BRANCH could be pulled to top ADD https://api.github.com/repos/ehb54/ultrascan3/git/refs/heads/$ultrascan_branch version.json RUN git clone https://github.com/ehb54/ultrascan3.git +RUN cd $ULTRASCAN && git fetch --all +RUN cd $ULTRASCAN && git checkout -B $ultrascan_branch +RUN cd $ULTRASCAN && git reset --hard origin/$ultrascan_branch # setup initial local.pri's diff --git a/admin/release/ubuntu/Dockerfile b/admin/release/ubuntu/Dockerfile index 3cb881638..153f825a3 100644 --- a/admin/release/ubuntu/Dockerfile +++ b/admin/release/ubuntu/Dockerfile @@ -90,6 +90,9 @@ RUN wget https://versaweb.dl.sourceforge.net/project/qwt/qwt/$qwt_version/qwt-$q ## BRANCH could be pulled to top ADD https://api.github.com/repos/ehb54/ultrascan3/git/refs/heads/$ultrascan_branch version.json RUN git clone https://github.com/ehb54/ultrascan3.git +RUN cd $ULTRASCAN && git fetch --all +RUN cd $ULTRASCAN && git checkout -B $ultrascan_branch +RUN cd $ULTRASCAN && git reset --hard origin/$ultrascan_branch # setup initial local.pri's From 56ddd5c6fcd11e41322309d3d78d21a77e274855 Mon Sep 17 00:00:00 2001 From: samo38 Date: Fri, 20 Dec 2024 10:14:36 -0700 Subject: [PATCH 3/3] update redhat version to 8.10 and qt version to 5.15.16 --- admin/release/buildpkg.pl | 2 +- admin/release/redhat/Dockerfile | 2 +- admin/release/ubuntu/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/release/buildpkg.pl b/admin/release/buildpkg.pl index ba1cb9edd..5518ab22e 100755 --- a/admin/release/buildpkg.pl +++ b/admin/release/buildpkg.pl @@ -16,7 +16,7 @@ "ubuntu:18.04" => "python" ,"ubuntu:20.04" => "python" ,"ubuntu:22.04" => "python3" - ,"redhat:8.7" => "python3" + ,"redhat:8.10" => "python3" ); $snames = join( "\n", keys %supported ); diff --git a/admin/release/redhat/Dockerfile b/admin/release/redhat/Dockerfile index 5e1d1db18..b02028b5f 100644 --- a/admin/release/redhat/Dockerfile +++ b/admin/release/redhat/Dockerfile @@ -12,7 +12,7 @@ ARG ultrascan_branch=master ## qt defaults ARG qt_major_version=5.15 -ARG qt_version=5.15.8 +ARG qt_version=5.15.16 ARG qwt_version=6.1.6 ### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml diff --git a/admin/release/ubuntu/Dockerfile b/admin/release/ubuntu/Dockerfile index 153f825a3..18fd875a2 100644 --- a/admin/release/ubuntu/Dockerfile +++ b/admin/release/ubuntu/Dockerfile @@ -12,7 +12,7 @@ ARG ultrascan_branch=master ## qt defaults ARG qt_major_version=5.15 -ARG qt_version=5.15.12 +ARG qt_version=5.15.16 ARG qwt_version=6.1.6 ### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml