merged master -> find-refactoring

orthanc-server · Sep 19, 2024 · e510e47 · e510e47
2 parents 2af7fab + a5b50ea
commit e510e47
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -44,7 +44,8 @@ jobs:
     runs-on: ${{ inputs.runner }}
     # prevent 2 concurrent jobs (needed for ARM64 self-hosted runner)
     concurrency:
-      group: ${{ inputs.runner }}
+      # Only limit concurrency on arm64 build, otherwise, use a random group name
+      group: ${{ contains(inputs.runner, 'arm64') && 'arm64-group' || format('{0}-{1}', github.run_id, inputs.stable_unstable) }}
       cancel-in-progress: false
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}

diff --git a/README-dockerhub.md b/README-dockerhub.md
@@ -24,7 +24,7 @@ Release notes are available [here](https://github.com/orthanc-server/orthanc-bui
 
 # packages content
 
-#### 24.8.2 Default image
+#### 24.8.3 Default image
 ```
 component                             version
 ---------------------------------------------
@@ -35,7 +35,7 @@ Connectivity check plugin             1.12.4
 Housekeeper plugin                    1.12.4
 Delayed Deletion plugin               1.12.4
 Multitenant DICOM plugin              1.12.4
-Stone Web viewer plugin               2.5+bea4e7900a47
+Stone Web viewer plugin               2.6
 Osimis Web viewer plugin              1.4.3
 Python plugin                         4.3
 Orthanc Web viewer plugin             2.9
@@ -65,7 +65,7 @@ Lua                                   5.4
 
 ```
 
-#### 24.8.2-full image 
+#### 24.8.3-full image
 ```
 additional component                  version
 ---------------------------------------------

diff --git a/build-matrix.json b/build-matrix.json
@@ -481,7 +481,7 @@
             "commentMacOS": "# disabled because link fails with ld: cannot link directly with dylib/framework, your binary is not an allowed client of /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk/usr/lib/libpython2.7.tbd for architecture x86_64",
             "buildForMacOS": false,
             "buildForWin": true,
-            "extraCMakeFlagsWin": "-DPYTHON_VERSION=3.12 -DPYTHON_WINDOWS_ROOT=C:/hostedtoolcache/windows/Python/3.12.4/x64/",
+            "extraCMakeFlagsWin": "-DPYTHON_VERSION=3.12 -DPYTHON_WINDOWS_ROOT=C:/hostedtoolcache/windows/Python/3.12.5/x64/",
             "artifactsWin": "OrthancPython.dll",
             "windows": [{
                 "Description": "Python plugin for Python 3.12 (AGPL license)",
@@ -504,8 +504,7 @@
             "repoType": "hg",
             "sourcesSubPath": "/Applications/StoneWebViewer/Plugin",
             "comment": "# CHANGE_VERSION_STONE_WEB_VIEWER",
-            "stable": "bea4e7900a47",
-            "BuildbotVersion" : "2.5",
+            "stable": "StoneWebViewer-2.6",
             "unstable": "default",
             "artifactsMacOS": "libStoneWebViewer.dylib",
             "commentMacOS": "# currently always building with wasm-binaries from latest offical version",

diff --git a/local-build.sh b/local-build.sh
@@ -87,7 +87,7 @@ ORTHANC_OHIF_COMMIT_ID=$(getCommitId "Orthanc-ohif" $version docker $skipCommitC
 ORTHANC_STL_COMMIT_ID=$(getCommitId "Orthanc-stl" $version docker $skipCommitChecks)
 ORTHANC_JAVA_COMMIT_ID=$(getCommitId "Orthanc-java" $version docker $skipCommitChecks)
 
-BASE_DEBIAN_IMAGE=bookworm-20240812-slim
+BASE_DEBIAN_IMAGE=bookworm-20240904-slim
 BASE_BUILDER_IMAGE_TAG=$BASE_DEBIAN_IMAGE-$version
 
 # list all intermediate targets.  It allows us to "slow down" the build and see what's going wrong (which is not possible with 10 parallel builds)

diff --git a/release-notes-docker-images.md b/release-notes-docker-images.md
@@ -34,6 +34,15 @@ Pending changes
   - re-enable many disabled tests
 
 
+- DOCKER: upgraded base image to `debian:bookworm-20240904-slim`
+
+
+24.8.3
+------
+
+- upgraded Stone Web viewer plugin to [2.6](https://orthanc.uclouvain.be/hg/orthanc-stone/file/tip/Applications/StoneWebViewer/NEWS)
+
+
 24.8.2
 ------