Skip to content

Console Output

Skipping 97 KB.. Full Log
2024-12-26 00:45:16,989 [     scc.git] DEBUG [detached HEAD 8ef3a83] merge master -Dorg -Ssuccess-only
2024-12-26 00:45:16,989 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:45:16,989 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:45:17,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-12-26 00:45:17,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2024-12-26 00:45:18,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2024-12-26 00:45:18,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2024-12-26 00:45:18,861 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:45:18,861 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-26 00:45:18,861 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:18,861 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:18,867 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:45:18,873 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:45:18,873 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:45:18,879 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:45:18,885 [     scc.git] DEBUG Already up to date.

2024-12-26 00:45:18,886 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:45:18,886 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:18,886 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:18,891 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:45:18,935 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:18,935 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:18,941 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:45:18,984 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:45:18,992 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f8282169580> has no local changes
2024-12-26 00:45:18,992 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-figure
Excluded PRs:
  - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
  - PR 600 Rdornier 'Label on rois' (user: Rdornier)
  - PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:45:19,003 [     scc.git] DEBUG [detached HEAD d5d8f015] merge master -Dorg -Ssuccess-only
2024-12-26 00:45:19,003 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:45:19,003 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:45:19,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-12-26 00:45:19,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-12-26 00:45:20,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-12-26 00:45:20,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-26 00:45:21,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:21,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-26 00:45:22,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:22,245 [    scc.repo] DEBUG   - PR 18 jburel 'default  size z value'
2024-12-26 00:45:22,245 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:45:22,245 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-26 00:45:22,245 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:22,245 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:22,252 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:45:22,256 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:45:22,257 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:45:22,262 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:45:22,267 [     scc.git] DEBUG Already up to date.

2024-12-26 00:45:22,268 [     scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-26 00:45:22,642 [     scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-26 00:45:22,643 [     scc.git] DEBUG  * branch            refs/pull/18/head -> FETCH_HEAD
2024-12-26 00:45:22,648 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:45:22,648 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:22,648 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:22,654 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-26 00:45:22,661 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:22,666 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default  size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-26 00:45:22,732 [     scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-26 00:45:22,733 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:45:22,736 [     scc.git] DEBUG  omero_fpbioimage/views.py | 2 ++
2024-12-26 00:45:22,736 [     scc.git] DEBUG  1 file changed, 2 insertions(+)
2024-12-26 00:45:22,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:22,886 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:45:22,931 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:22,932 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:22,938 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:45:22,989 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:45:22,996 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82821639a0> has no local changes
2024-12-26 00:45:22,997 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-fpbioimage
Already up to date.

Merged PRs:
  - PR 18 jburel 'default  size z value'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:45:23,007 [     scc.git] DEBUG [detached HEAD c3cf016] merge master -Dorg -Ssuccess-only
2024-12-26 00:45:23,007 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:45:23,008 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:45:23,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-26 00:45:23,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-26 00:45:24,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-26 00:45:24,498 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:25,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-26 00:45:25,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:26,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:26,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-26 00:45:27,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:27,061 [    scc.repo] DEBUG   - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-26 00:45:27,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-26 00:45:27,524 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:28,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-26 00:45:28,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:29,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:29,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-26 00:45:29,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:29,886 [    scc.repo] DEBUG   - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-26 00:45:30,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-26 00:45:30,343 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:30,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-26 00:45:31,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:31,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:32,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-26 00:45:32,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:32,795 [    scc.repo] DEBUG   - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-26 00:45:33,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-26 00:45:33,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-26 00:45:33,712 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:34,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-26 00:45:34,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:35,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:35,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-26 00:45:36,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:36,187 [    scc.repo] DEBUG   - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-26 00:45:36,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-26 00:45:36,643 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:37,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-26 00:45:37,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:38,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:38,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-26 00:45:39,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:39,227 [    scc.repo] DEBUG   - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-26 00:45:39,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-26 00:45:39,723 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:40,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-26 00:45:40,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:41,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:41,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-26 00:45:42,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:42,234 [    scc.repo] DEBUG   - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-26 00:45:42,234 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:45:42,234 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-26 00:45:42,234 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:42,234 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:42,247 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:45:42,254 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:45:42,254 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:45:42,259 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:45:42,265 [     scc.git] DEBUG Already up to date.

2024-12-26 00:45:42,266 [     scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-26 00:45:42,561 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:42,561 [     scc.git] DEBUG  * branch            refs/pull/113/head -> FETCH_HEAD
2024-12-26 00:45:42,566 [     scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-26 00:45:42,874 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:42,874 [     scc.git] DEBUG  * branch            refs/pull/114/head -> FETCH_HEAD
2024-12-26 00:45:42,880 [     scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-26 00:45:43,167 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:43,168 [     scc.git] DEBUG  * branch            refs/pull/115/head -> FETCH_HEAD
2024-12-26 00:45:43,172 [     scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-26 00:45:43,477 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:43,477 [     scc.git] DEBUG  * branch            refs/pull/116/head -> FETCH_HEAD
2024-12-26 00:45:43,484 [     scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-26 00:45:43,775 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:43,776 [     scc.git] DEBUG  * branch            refs/pull/117/head -> FETCH_HEAD
2024-12-26 00:45:43,780 [     scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-26 00:45:44,064 [     scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-26 00:45:44,065 [     scc.git] DEBUG  * branch            refs/pull/118/head -> FETCH_HEAD
2024-12-26 00:45:44,070 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:45:44,070 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:44,070 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:44,075 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-26 00:45:44,099 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:44,105 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-26 00:45:44,175 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:45:44,180 [     scc.git] DEBUG  package-lock.json | 12 ++++++------
2024-12-26 00:45:44,180 [     scc.git] DEBUG  1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-26 00:45:44,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:44,312 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-26 00:45:44,382 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:44,389 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-26 00:45:44,561 [     scc.git] DEBUG Auto-merging package-lock.json
2024-12-26 00:45:44,561 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:45:44,567 [     scc.git] DEBUG  package-lock.json | 625 +++---------------------------------------------------
2024-12-26 00:45:44,567 [     scc.git] DEBUG  1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-26 00:45:44,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:44,704 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-26 00:45:44,712 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:44,717 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-26 00:45:44,787 [     scc.git] DEBUG Auto-merging package-lock.json
2024-12-26 00:45:44,787 [     scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-26 00:45:44,787 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:45:44,788 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:45:44,794 [     scc.git] DEBUG Calling 'git reset --hard 56ee2866280e967e0b7145cdd7bcefcfa59a55c1'
2024-12-26 00:45:44,803 [     scc.git] DEBUG HEAD is now at 56ee286 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-26 00:45:45,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:45,098 [     scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-26 00:45:45,105 [     scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-26 00:45:45,110 [     scc.git] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
    - package-lock.json
  - PR #114 dependabot[bot] 'Bump tar and fsevents'
    - package-lock.json

--conflicts

2024-12-26 00:45:45,116 [  scc.config] DEBUG Found github.token
2024-12-26 00:45:45,116 [     scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-26 00:45:45,116 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-26 00:45:45,126 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:45,132 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-26 00:45:45,283 [     scc.git] DEBUG Auto-merging package-lock.json
2024-12-26 00:45:45,283 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:45:45,289 [     scc.git] DEBUG  package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-26 00:45:45,289 [     scc.git] DEBUG  1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-26 00:45:45,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:45,479 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-26 00:45:45,530 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:45,536 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-26 00:45:45,589 [     scc.git] DEBUG Auto-merging package-lock.json
2024-12-26 00:45:45,590 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:45:45,595 [     scc.git] DEBUG  package-lock.json | 6 +++---
2024-12-26 00:45:45,595 [     scc.git] DEBUG  1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-26 00:45:45,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:45,872 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-26 00:45:45,881 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:45,886 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-26 00:45:45,999 [     scc.git] DEBUG Auto-merging package-lock.json
2024-12-26 00:45:45,999 [     scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-26 00:45:45,999 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:45:46,000 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:45:46,007 [     scc.git] DEBUG Calling 'git reset --hard d8b59dd65a73f387f98a26d4c5cfb6879315da37'
2024-12-26 00:45:46,016 [     scc.git] DEBUG HEAD is now at d8b59dd merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-26 00:45:46,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:45:46,254 [     scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-26 00:45:46,261 [     scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-26 00:45:46,267 [     scc.git] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
    - package-lock.json
  - PR #114 dependabot[bot] 'Bump tar and fsevents'
    - package-lock.json
  - PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
    - package-lock.json
  - PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
    - package-lock.json
  - PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
    - package-lock.json

--conflicts

2024-12-26 00:45:46,272 [  scc.config] DEBUG Found github.token
2024-12-26 00:45:46,272 [     scc.git] DEBUG Adding comment to issue #118.
2024-12-26 00:45:47,117 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-26 00:45:47,118 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:45:47,165 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:45:47,166 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:45:47,173 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:45:47,219 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:45:47,228 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f828214fb20> has no local changes
2024-12-26 00:45:47,228 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-gallery
Already up to date.

Merged PRs:
  - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
  - PR 114 dependabot[bot] 'Bump tar and fsevents'
  - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
  - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'

Conflicting PRs (not included):
  - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
  - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:45:47,237 [     scc.git] DEBUG [detached HEAD 92443a5] merge master -Dorg -Ssuccess-only
2024-12-26 00:45:47,238 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:45:47,238 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:45:47,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-26 00:45:48,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-26 00:45:48,138 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-12-26 00:45:48,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-26 00:45:49,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:49,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:50,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-26 00:45:50,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:50,887 [    scc.repo] DEBUG   - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-26 00:45:51,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-26 00:45:51,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-26 00:45:52,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-26 00:45:52,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-26 00:45:53,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-26 00:45:53,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:54,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:54,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-26 00:45:55,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:55,201 [    scc.repo] DEBUG   - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-26 00:45:55,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-26 00:45:56,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-26 00:45:56,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-26 00:45:57,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:45:57,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:45:58,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-26 00:45:58,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:45:58,618 [    scc.repo] DEBUG   - PR 465 will-moore 'Save as Figure'
2024-12-26 00:45:59,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-26 00:45:59,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-26 00:46:00,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-26 00:46:00,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:01,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-26 00:46:01,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:01,469 [    scc.repo] DEBUG   - PR 460 will-moore 'Channel min spinner fix'
2024-12-26 00:46:01,469 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:01,470 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-26 00:46:01,470 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:01,470 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:01,476 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:01,481 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:01,481 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:01,487 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:01,494 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:01,494 [     scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-26 00:46:02,948 [     scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-26 00:46:02,948 [     scc.git] DEBUG  * branch            refs/pull/460/head -> FETCH_HEAD
2024-12-26 00:46:02,954 [     scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-26 00:46:04,179 [     scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-26 00:46:04,179 [     scc.git] DEBUG  * branch            refs/pull/465/head -> FETCH_HEAD
2024-12-26 00:46:04,184 [     scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-26 00:46:04,620 [     scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-26 00:46:04,620 [     scc.git] DEBUG  * branch            refs/pull/471/head -> FETCH_HEAD
2024-12-26 00:46:04,626 [     scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-26 00:46:04,908 [     scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-26 00:46:04,908 [     scc.git] DEBUG  * branch            refs/pull/499/head -> FETCH_HEAD
2024-12-26 00:46:04,912 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:04,912 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:04,913 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:04,918 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-26 00:46:04,926 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:04,931 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-26 00:46:05,004 [     scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-26 00:46:05,004 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:05,008 [     scc.git] DEBUG  src/model/image_info.js       | 7 ++++---
2024-12-26 00:46:05,008 [     scc.git] DEBUG  src/settings/channel-range.js | 4 +++-
2024-12-26 00:46:05,008 [     scc.git] DEBUG  2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-26 00:46:05,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:05,162 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-26 00:46:05,171 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:05,176 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-26 00:46:05,356 [     scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-26 00:46:05,356 [     scc.git] DEBUG Auto-merging src/app/context.js
2024-12-26 00:46:05,356 [     scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-26 00:46:05,356 [     scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-26 00:46:05,356 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:05,361 [     scc.git] DEBUG  plugin/omero_iviewer/views.py |  17 +++-
2024-12-26 00:46:05,361 [     scc.git] DEBUG  src/app/context.js            |   6 +-
2024-12-26 00:46:05,361 [     scc.git] DEBUG  src/app/header.html           |   5 +
2024-12-26 00:46:05,361 [     scc.git] DEBUG  src/app/header.js             |  45 ++++++++-
2024-12-26 00:46:05,361 [     scc.git] DEBUG  src/utils/constants.js        |   6 ++
2024-12-26 00:46:05,361 [     scc.git] DEBUG  src/utils/figure.js           | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-26 00:46:05,361 [     scc.git] DEBUG  6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-26 00:46:05,361 [     scc.git] DEBUG  create mode 100644 src/utils/figure.js
2024-12-26 00:46:05,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:05,546 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-26 00:46:05,556 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:05,563 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-26 00:46:05,615 [     scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-26 00:46:05,616 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:05,619 [     scc.git] DEBUG  src/controls/dimension-slider.html |  2 +-
2024-12-26 00:46:05,619 [     scc.git] DEBUG  src/controls/dimension-slider.js   | 20 ++++++++++++++++++++
2024-12-26 00:46:05,619 [     scc.git] DEBUG  2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-26 00:46:05,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:05,931 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-26 00:46:05,990 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:05,996 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-26 00:46:06,028 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:06,038 [     scc.git] DEBUG  package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-26 00:46:06,039 [     scc.git] DEBUG  package.json      |   2 +-
2024-12-26 00:46:06,039 [     scc.git] DEBUG  2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-26 00:46:06,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:06,345 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:06,386 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:06,386 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:06,393 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:06,446 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:06,457 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82821415e0> has no local changes
2024-12-26 00:46:06,457 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-iviewer
Excluded PRs:
  - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
  - PR 420 will-moore 'Add release process to README' (exclude comment)
  - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.

Merged PRs:
  - PR 460 will-moore 'Channel min spinner fix'
  - PR 465 will-moore 'Save as Figure'
  - PR 471 will-moore 'Z projection disabled tooltip'
  - PR 499 dependabot[bot] 'Bump nanoid and mocha'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:06,471 [     scc.git] DEBUG [detached HEAD 2deda98] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:06,471 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:06,472 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:06,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-26 00:46:07,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-26 00:46:07,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-26 00:46:08,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-26 00:46:08,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:09,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-26 00:46:09,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:09,724 [    scc.repo] DEBUG   - PR 74 will-moore 'mapr extension of webclient'
2024-12-26 00:46:09,724 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:09,724 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-26 00:46:09,724 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:09,725 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:09,732 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:09,737 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:09,737 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:09,743 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:09,749 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:09,750 [     scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-26 00:46:10,307 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-26 00:46:10,307 [     scc.git] DEBUG  * branch            refs/pull/74/head -> FETCH_HEAD
2024-12-26 00:46:10,312 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:10,313 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:10,313 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:10,318 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-26 00:46:10,324 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:10,329 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-26 00:46:10,339 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:10,342 [     scc.git] DEBUG  .../templates/webclient/base/base_container.html   | 182 +++++++++++++
2024-12-26 00:46:10,342 [     scc.git] DEBUG  .../data/includes/right_plugin.general.js.html     | 290 ---------------------
2024-12-26 00:46:10,342 [     scc.git] DEBUG  requirements.txt                                   |   2 +-
2024-12-26 00:46:10,342 [     scc.git] DEBUG  3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-26 00:46:10,342 [     scc.git] DEBUG  create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-26 00:46:10,342 [     scc.git] DEBUG  delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-26 00:46:10,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:10,485 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:10,526 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:10,526 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:10,533 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:10,572 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:10,578 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800e85b0> has no local changes
2024-12-26 00:46:10,579 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-mapr
Excluded PRs:
  - PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.

Merged PRs:
  - PR 74 will-moore 'mapr extension of webclient'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:10,587 [     scc.git] DEBUG [detached HEAD b07554f] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:10,587 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:10,587 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:11,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-26 00:46:11,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-26 00:46:12,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-26 00:46:12,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-26 00:46:12,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:13,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-26 00:46:13,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:13,974 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-26 00:46:14,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-26 00:46:15,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-26 00:46:15,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-26 00:46:15,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:16,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-26 00:46:16,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:16,882 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-26 00:46:16,882 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:16,882 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-26 00:46:16,883 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:16,883 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:16,890 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:16,895 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:16,895 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:16,900 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:16,906 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:16,906 [     scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-26 00:46:17,583 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-26 00:46:17,583 [     scc.git] DEBUG  * branch            refs/pull/55/head -> FETCH_HEAD
2024-12-26 00:46:17,588 [     scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-26 00:46:18,146 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-26 00:46:18,146 [     scc.git] DEBUG  * branch            refs/pull/64/head -> FETCH_HEAD
2024-12-26 00:46:18,150 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:18,151 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:18,151 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:18,157 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-26 00:46:18,164 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:18,170 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-26 00:46:18,295 [     scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-26 00:46:18,295 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-26 00:46:18,295 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-26 00:46:18,295 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-26 00:46:18,295 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:46:18,296 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:46:18,302 [     scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-26 00:46:18,309 [     scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-26 00:46:18,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:18,445 [     scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-26 00:46:18,453 [     scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-26 00:46:18,488 [     scc.git] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - src/omero_metadata/populate.py
    - src/omero_metadata/cli.py

--conflicts

2024-12-26 00:46:18,494 [  scc.config] DEBUG Found github.token
2024-12-26 00:46:18,494 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-26 00:46:18,494 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-26 00:46:18,501 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:18,505 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-26 00:46:18,594 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-26 00:46:18,595 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-26 00:46:18,595 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-26 00:46:18,595 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:46:18,595 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:46:18,602 [     scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-26 00:46:18,609 [     scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-26 00:46:18,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:18,843 [     scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-26 00:46:18,851 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-26 00:46:18,858 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - PR #55 kkoz 'Prevent users from creating columns with python keyword names'
    - src/omero_metadata/populate.py
  - Upstream changes
    - src/omero_metadata/populate.py

--conflicts

2024-12-26 00:46:18,863 [  scc.config] DEBUG Found github.token
2024-12-26 00:46:18,863 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-26 00:46:18,863 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:18,910 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:18,910 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:18,918 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:18,961 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:18,969 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800fcb80> has no local changes
2024-12-26 00:46:18,969 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-metadata
Already up to date.

Conflicting PRs (not included):
  - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
  - PR 64 will-moore 'Support images_by_name for Screen and Plate'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:18,979 [     scc.git] DEBUG [detached HEAD 3ec067a] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:18,980 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:18,980 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:19,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-26 00:46:19,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-26 00:46:20,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-26 00:46:20,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-26 00:46:21,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-26 00:46:21,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-26 00:46:22,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-26 00:46:22,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-26 00:46:22,665 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:22,665 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-26 00:46:22,665 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:22,665 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:22,671 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:22,677 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:22,677 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:22,684 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:22,706 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:22,706 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:22,706 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:22,706 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:22,713 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:22,754 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:22,754 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:22,760 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:22,802 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:22,809 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f828211ff40> has no local changes
2024-12-26 00:46:22,809 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-parade
Excluded PRs:
  - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
  - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
  - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
  - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:22,817 [     scc.git] DEBUG [detached HEAD 23b4bab] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:22,817 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:22,818 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:23,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2024-12-26 00:46:23,052 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:23,052 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-26 00:46:23,052 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:23,052 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:23,060 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:23,066 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:23,066 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:23,071 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:23,078 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:23,078 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:23,078 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:23,078 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:23,084 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:23,124 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:23,124 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:23,129 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:23,168 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:23,174 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f828009f940> has no local changes
2024-12-26 00:46:23,174 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-prometheus-tools
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:23,182 [     scc.git] DEBUG [detached HEAD e1f82e4] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:23,183 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:23,183 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:23,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-26 00:46:24,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-26 00:46:24,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-26 00:46:25,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-26 00:46:25,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:25,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-26 00:46:26,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:26,350 [    scc.repo] DEBUG   - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-26 00:46:26,350 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:26,350 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-26 00:46:26,350 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:26,350 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:26,356 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:26,362 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:26,362 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:26,369 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:26,376 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:26,376 [     scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-26 00:46:26,718 [     scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-26 00:46:26,718 [     scc.git] DEBUG  * branch            refs/pull/6/head -> FETCH_HEAD
2024-12-26 00:46:26,723 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:26,724 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:26,724 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:26,730 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-26 00:46:26,738 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:26,744 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-26 00:46:26,755 [     scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-26 00:46:26,755 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:26,758 [     scc.git] DEBUG  src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-26 00:46:26,758 [     scc.git] DEBUG  1 file changed, 33 insertions(+)
2024-12-26 00:46:26,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:26,907 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:26,950 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:26,951 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:26,957 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:26,998 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:27,005 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800595e0> has no local changes
2024-12-26 00:46:27,005 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-rois
Already up to date.

Merged PRs:
  - PR 6 dominikl 'Add method to create masks grouped by label id'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:27,014 [     scc.git] DEBUG [detached HEAD 13c2b49] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:27,015 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:27,015 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:27,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-26 00:46:27,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-26 00:46:28,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-26 00:46:28,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-26 00:46:29,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:29,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-26 00:46:30,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:30,354 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-26 00:46:30,354 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:30,354 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-26 00:46:30,354 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:30,354 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:30,361 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:30,366 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:30,366 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:30,373 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:30,380 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:30,381 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-26 00:46:30,756 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-26 00:46:30,756 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2024-12-26 00:46:30,761 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:30,762 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:30,762 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:30,768 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-26 00:46:30,775 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:30,780 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-26 00:46:30,832 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-26 00:46:30,832 [     scc.git] DEBUG Auto-merging setup.py
2024-12-26 00:46:30,833 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-26 00:46:30,833 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:46:30,833 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:46:30,839 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-26 00:46:30,847 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2024-12-26 00:46:30,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:30,987 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-26 00:46:31,001 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-26 00:46:31,076 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_signup/views.py
    - omero_signup/signup_settings.py
    - omero_signup/urls.py
    - setup.py

--conflicts

2024-12-26 00:46:31,083 [  scc.config] DEBUG Found github.token
2024-12-26 00:46:31,083 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-26 00:46:31,083 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:31,128 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:31,129 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:31,136 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:31,183 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:31,190 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800597f0> has no local changes
2024-12-26 00:46:31,191 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-signup
Already up to date.

Conflicting PRs (not included):
  - PR 14 manics 'Add pre-commit (black, flake8)'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:31,201 [     scc.git] DEBUG [detached HEAD f6cce75] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:31,201 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:31,202 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:31,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-26 00:46:31,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-26 00:46:32,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-26 00:46:32,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-26 00:46:33,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:33,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:46:34,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-26 00:46:34,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-26 00:46:35,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-26 00:46:35,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-26 00:46:36,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-26 00:46:36,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:37,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-26 00:46:37,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:37,749 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-26 00:46:37,749 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:37,749 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-26 00:46:37,749 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:37,749 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:37,756 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:37,761 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:37,762 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:37,768 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:37,775 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:37,775 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-26 00:46:38,177 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-26 00:46:38,177 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2024-12-26 00:46:38,182 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:38,182 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:38,182 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,188 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-26 00:46:38,196 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,203 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-26 00:46:38,224 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:38,227 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2024-12-26 00:46:38,228 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2024-12-26 00:46:38,231 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2024-12-26 00:46:38,231 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2024-12-26 00:46:38,232 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2024-12-26 00:46:38,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:38,361 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:38,406 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:38,406 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,413 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:38,457 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:38,465 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f8280059640> has no local changes
2024-12-26 00:46:38,465 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-test-infra
Excluded PRs:
  - PR 75 marimeireles 'Microservices' (user: marimeireles)
  - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
  - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.

Merged PRs:
  - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:38,476 [     scc.git] DEBUG [detached HEAD 4a07baf] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:38,476 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:38,476 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:38,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-26 00:46:38,823 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:38,823 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-26 00:46:38,823 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:38,823 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,830 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:38,836 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:38,836 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:38,843 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:38,850 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:38,850 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:38,850 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:38,850 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,855 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:38,898 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:38,898 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:38,905 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:38,949 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:38,956 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800c64c0> has no local changes
2024-12-26 00:46:38,956 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-upload
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:38,966 [     scc.git] DEBUG [detached HEAD dd5627e] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:38,966 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:38,967 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:39,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-26 00:46:39,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-26 00:46:40,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2024-12-26 00:46:40,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-26 00:46:41,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:41,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:46:42,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-26 00:46:42,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:42,777 [    scc.repo] DEBUG   - PR 20 jburel 'Build'
2024-12-26 00:46:42,777 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:42,777 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-26 00:46:42,777 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:42,777 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:42,784 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:42,791 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:42,792 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:42,799 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:42,805 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:42,805 [     scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-26 00:46:43,444 [     scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-26 00:46:43,444 [     scc.git] DEBUG  * branch            refs/pull/20/head -> FETCH_HEAD
2024-12-26 00:46:43,450 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:43,450 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:43,450 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:43,456 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-26 00:46:43,461 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:43,466 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-26 00:46:43,748 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:46:43,751 [     scc.git] DEBUG  .github/workflows/omero_plugin.yml |  2 +-
2024-12-26 00:46:43,751 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-26 00:46:43,751 [     scc.git] DEBUG  .omeroci/app-build                 | 19 +++++++++++++++++++
2024-12-26 00:46:43,751 [     scc.git] DEBUG  3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-26 00:46:43,751 [     scc.git] DEBUG  create mode 100755 .omeroci/app-build
2024-12-26 00:46:43,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:43,954 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:44,001 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:44,002 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:44,008 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:44,047 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:44,055 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800c6790> has no local changes
2024-12-26 00:46:44,055 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-virtual-microscope
Already up to date.

Merged PRs:
  - PR 20 jburel 'Build'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:44,064 [     scc.git] DEBUG [detached HEAD 878ca6e] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:44,065 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:44,065 [     scc.git] INFO  Overriding base-branch from master to main
2024-12-26 00:46:44,065 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:44,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-26 00:46:44,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-26 00:46:45,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-26 00:46:45,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-26 00:46:46,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:47,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:46:47,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-26 00:46:47,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-26 00:46:48,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-26 00:46:49,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-26 00:46:49,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:49,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-26 00:46:50,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:50,296 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-26 00:46:50,297 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:50,297 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-26 00:46:50,297 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:50,297 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:50,305 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-26 00:46:50,310 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:50,310 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-26 00:46:50,315 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-26 00:46:50,321 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:50,321 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-26 00:46:50,740 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-26 00:46:50,740 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2024-12-26 00:46:50,746 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:50,746 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:50,747 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:50,754 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-26 00:46:50,761 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:50,766 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-26 00:46:50,880 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-26 00:46:50,880 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-26 00:46:50,880 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:46:50,881 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:46:50,887 [     scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-26 00:46:50,894 [     scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2024-12-26 00:46:51,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:51,031 [     scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-26 00:46:51,039 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-26 00:46:51,047 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2024-12-26 00:46:51,069 [  scc.config] DEBUG Found github.token
2024-12-26 00:46:51,070 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-26 00:46:51,070 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:51,110 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,111 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,117 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:51,160 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:51,167 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f8280031580> has no local changes
2024-12-26 00:46:51,167 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 18 will-moore 'Build' (status: failure)
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.

Conflicting PRs (not included):
  - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:51,175 [     scc.git] DEBUG [detached HEAD c35bf4c] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:51,175 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:51,176 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:51,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-26 00:46:51,440 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:51,440 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-26 00:46:51,440 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,440 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,446 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:51,451 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:51,452 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:51,457 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:51,464 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:51,464 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:51,464 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,464 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,469 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:51,508 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,508 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,513 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:51,552 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:51,559 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82800314f0> has no local changes
2024-12-26 00:46:51,559 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-weberror
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:51,568 [     scc.git] DEBUG [detached HEAD 14c3c46] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:51,568 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:51,569 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:51,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-26 00:46:51,866 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:51,866 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-26 00:46:51,866 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,866 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,872 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:51,877 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:51,877 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:51,883 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:51,888 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:51,888 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:51,888 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,888 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,893 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:51,934 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:51,934 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:51,940 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:51,980 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:51,990 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f8280042bb0> has no local changes
2024-12-26 00:46:51,991 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-webtest
Already up to date.


Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:52,007 [     scc.git] DEBUG [detached HEAD 42a16e2] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:52,008 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:52,008 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:52,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-26 00:46:52,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-26 00:46:53,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-26 00:46:53,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-26 00:46:54,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:54,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-26 00:46:55,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:55,078 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2024-12-26 00:46:55,078 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:46:55,078 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-26 00:46:55,079 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:55,079 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:55,085 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-26 00:46:55,092 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:46:55,092 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-26 00:46:55,099 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-26 00:46:55,115 [     scc.git] DEBUG Already up to date.

2024-12-26 00:46:55,115 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-26 00:46:55,600 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-26 00:46:55,601 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2024-12-26 00:46:55,607 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:46:55,607 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:55,607 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:55,615 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-26 00:46:55,624 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:55,631 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-26 00:46:55,738 [     scc.git] DEBUG Auto-merging Dockerfile
2024-12-26 00:46:55,738 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-26 00:46:55,738 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:46:55,739 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:46:55,750 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-26 00:46:55,761 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-26 00:46:55,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:46:55,899 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-26 00:46:55,906 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-26 00:46:55,913 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2024-12-26 00:46:55,920 [  scc.config] DEBUG Found github.token
2024-12-26 00:46:55,921 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-26 00:46:55,921 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:46:55,978 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:46:55,979 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:46:55,985 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:46:56,029 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:46:56,038 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82687d9a60> has no local changes
2024-12-26 00:46:56,038 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/rOMERO-gateway
Already up to date.

Conflicting PRs (not included):
  - PR 100 dominikl 'Run tests properly'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:46:56,048 [     scc.git] DEBUG [detached HEAD dfc789e] merge master -Dorg -Ssuccess-only
2024-12-26 00:46:56,049 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:46:56,049 [     scc.git] INFO  Overriding base-branch from master to develop
2024-12-26 00:46:56,049 [    scc.repo] DEBUG ## PRs found:
2024-12-26 00:46:56,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-26 00:46:56,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-26 00:46:57,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-26 00:46:57,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-26 00:46:58,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:46:58,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-26 00:46:59,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-26 00:46:59,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:46:59,645 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-26 00:47:00,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-26 00:47:00,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-26 00:47:01,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-26 00:47:01,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-26 00:47:01,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-26 00:47:02,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-26 00:47:02,328 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-26 00:47:02,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-26 00:47:03,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-26 00:47:03,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-26 00:47:04,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-26 00:47:04,253 [    scc.repo] DEBUG ## Branches found:
2024-12-26 00:47:04,253 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-26 00:47:04,253 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:47:04,253 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:47:04,260 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-26 00:47:04,265 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-26 00:47:04,265 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-26 00:47:04,270 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-26 00:47:04,275 [     scc.git] DEBUG Already up to date.

2024-12-26 00:47:04,276 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-26 00:47:05,206 [     scc.git] DEBUG From https://github.com/ome/scripts
2024-12-26 00:47:05,206 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2024-12-26 00:47:05,212 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-26 00:47:05,704 [     scc.git] DEBUG From https://github.com/ome/scripts
2024-12-26 00:47:05,705 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2024-12-26 00:47:05,709 [     scc.git] DEBUG ## Unique users: []
2024-12-26 00:47:05,710 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:47:05,710 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:47:05,717 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-26 00:47:05,725 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:47:05,730 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-26 00:47:05,757 [     scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19.  Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2024-12-26 00:47:05,757 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-26 00:47:05,757 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-26 00:47:05,763 [     scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-26 00:47:05,769 [     scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2024-12-26 00:47:05,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:05,907 [     scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-26 00:47:05,918 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-26 00:47:05,925 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#287](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2024-12-26 00:47:05,929 [  scc.config] DEBUG Found github.token
2024-12-26 00:47:05,930 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-26 00:47:05,930 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-26 00:47:05,936 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:47:05,941 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-26 00:47:05,961 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-26 00:47:05,964 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-26 00:47:05,964 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-26 00:47:06,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:06,302 [     scc.git] DEBUG Calling 'git submodule update'
2024-12-26 00:47:06,350 [     scc.git] DEBUG Get sha1 of %s
2024-12-26 00:47:06,350 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-26 00:47:06,357 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:47:06,403 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:47:06,411 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f82687d96a0> has no local changes
2024-12-26 00:47:06,412 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/scripts
Excluded PRs:
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.

Merged PRs:
  - PR 223 will-moore 'don't attempt ROI stats on big images'

Conflicting PRs (not included):
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:47:06,422 [     scc.git] DEBUG [detached HEAD 647822f] merge master -Dorg -Ssuccess-only
2024-12-26 00:47:06,422 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:06,423 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-26 00:47:06,507 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-26 00:47:06,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:06,709 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-26 00:47:06,715 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-26 00:47:07,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:07,123 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-26 00:47:07,129 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-26 00:47:07,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:07,516 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-26 00:47:07,520 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-26 00:47:07,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:07,904 [  scc.config] DEBUG Found submodule.omero-figure.url
2024-12-26 00:47:08,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:08,291 [  scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-26 00:47:08,296 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-26 00:47:08,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:08,672 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-26 00:47:08,677 [  scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-26 00:47:09,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:09,069 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-26 00:47:09,075 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-26 00:47:09,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:09,456 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-26 00:47:09,461 [  scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-26 00:47:09,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:09,838 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-26 00:47:09,842 [  scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-26 00:47:10,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:10,238 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-26 00:47:10,244 [  scc.config] DEBUG Found submodule.omero-parade.url
2024-12-26 00:47:10,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:10,726 [  scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-26 00:47:10,731 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-26 00:47:11,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:11,185 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-26 00:47:11,190 [  scc.config] DEBUG Found submodule.omero-rois.url
2024-12-26 00:47:11,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:11,626 [  scc.config] DEBUG Found submodule.omero-signup.url
2024-12-26 00:47:12,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:12,018 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-26 00:47:12,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:12,408 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-26 00:47:12,413 [  scc.config] DEBUG Found submodule.omero-upload.url
2024-12-26 00:47:12,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:12,803 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-26 00:47:13,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:13,202 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-26 00:47:13,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:13,588 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-26 00:47:13,594 [  scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-26 00:47:13,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:13,974 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-26 00:47:13,979 [  scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-26 00:47:14,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:14,367 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-26 00:47:14,371 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-26 00:47:14,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:14,740 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-26 00:47:14,745 [  scc.config] DEBUG Found submodule.scripts.url
2024-12-26 00:47:15,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-26 00:47:15,133 [  scc.config] DEBUG Found submodule.scripts.branch
2024-12-26 00:47:15,133 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-12-26 00:47:15,222 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f8283237be0> has local changes
2024-12-26 00:47:15,222 [     scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-plugins
Already up to date.

Merged PRs:
  - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'

Repository: ome/minimal-omero-client
Already up to date.


Repository: ome/omero-cli-duplicate
Excluded PRs:
  - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.


Repository: ome/omero-cli-render
Excluded PRs:
  - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.

Merged PRs:
  - PR 59 will-moore 'Apply settings to Plate'

Repository: ome/omero-cli-zarr
Excluded PRs:
  - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.

Merged PRs:
  - PR 147 will-moore 'Name option'

Conflicting PRs (not included):
  - PR 102 will-moore 'Zarr export tests'
  - PR 123 will-moore 'Support export of Fileset:ID'

Repository: ome/omero-figure
Excluded PRs:
  - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
  - PR 600 Rdornier 'Label on rois' (user: Rdornier)
  - PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.


Repository: ome/omero-fpbioimage
Already up to date.

Merged PRs:
  - PR 18 jburel 'default  size z value'

Repository: ome/omero-gallery
Already up to date.

Merged PRs:
  - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
  - PR 114 dependabot[bot] 'Bump tar and fsevents'
  - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
  - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'

Conflicting PRs (not included):
  - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
  - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'

Repository: ome/omero-iviewer
Excluded PRs:
  - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
  - PR 420 will-moore 'Add release process to README' (exclude comment)
  - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.

Merged PRs:
  - PR 460 will-moore 'Channel min spinner fix'
  - PR 465 will-moore 'Save as Figure'
  - PR 471 will-moore 'Z projection disabled tooltip'
  - PR 499 dependabot[bot] 'Bump nanoid and mocha'

Repository: ome/omero-mapr
Excluded PRs:
  - PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.

Merged PRs:
  - PR 74 will-moore 'mapr extension of webclient'

Repository: ome/omero-metadata
Already up to date.

Conflicting PRs (not included):
  - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
  - PR 64 will-moore 'Support images_by_name for Screen and Plate'

Repository: ome/omero-parade
Excluded PRs:
  - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
  - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
  - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
  - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.


Repository: ome/omero-prometheus-tools
Already up to date.


Repository: ome/omero-rois
Already up to date.

Merged PRs:
  - PR 6 dominikl 'Add method to create masks grouped by label id'

Repository: ome/omero-signup
Already up to date.

Conflicting PRs (not included):
  - PR 14 manics 'Add pre-commit (black, flake8)'

Repository: openmicroscopy/omero-test-infra
Excluded PRs:
  - PR 75 marimeireles 'Microservices' (user: marimeireles)
  - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
  - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.

Merged PRs:
  - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'

Repository: ome/omero-upload
Already up to date.


Repository: ome/omero-virtual-microscope
Already up to date.

Merged PRs:
  - PR 20 jburel 'Build'

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 18 will-moore 'Build' (status: failure)
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.

Conflicting PRs (not included):
  - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'

Repository: openmicroscopy/omero-weberror
Already up to date.


Repository: openmicroscopy/omero-webtest
Already up to date.


Repository: ome/rOMERO-gateway
Already up to date.

Conflicting PRs (not included):
  - PR 100 dominikl 'Run tests properly'

Repository: ome/scripts
Excluded PRs:
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.

Merged PRs:
  - PR 223 will-moore 'don't attempt ROI stats on big images'

Conflicting PRs (not included):
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'

Generated by OMERO-plugins-push#287 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/287/)'
2024-12-26 00:47:15,237 [     scc.git] DEBUG [detached HEAD cffd0c1] merge master -Dorg -Ssuccess-only
2024-12-26 00:47:15,237 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-26 00:47:15,237 [   scc.merge] INFO  Repository: ome/omero-plugins
2024-12-26 00:47:15,237 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,237 [   scc.merge] INFO  
2024-12-26 00:47:15,237 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,237 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2024-12-26 00:47:15,237 [   scc.merge] INFO  
2024-12-26 00:47:15,237 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2024-12-26 00:47:15,237 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,237 [   scc.merge] INFO  
2024-12-26 00:47:15,237 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2024-12-26 00:47:15,238 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-26 00:47:15,238 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Repository: ome/omero-cli-render
2024-12-26 00:47:15,238 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-26 00:47:15,238 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2024-12-26 00:47:15,238 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-26 00:47:15,238 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 102 will-moore 'Zarr export tests'
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Repository: ome/omero-figure
2024-12-26 00:47:15,238 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-26 00:47:15,238 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-26 00:47:15,238 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,238 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2024-12-26 00:47:15,238 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,238 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Repository: ome/omero-gallery
2024-12-26 00:47:15,239 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Repository: ome/omero-iviewer
2024-12-26 00:47:15,239 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-26 00:47:15,239 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Repository: ome/omero-mapr
2024-12-26 00:47:15,239 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-26 00:47:15,239 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,239 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2024-12-26 00:47:15,239 [   scc.merge] INFO  
2024-12-26 00:47:15,239 [   scc.merge] INFO  Repository: ome/omero-metadata
2024-12-26 00:47:15,239 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Repository: ome/omero-parade
2024-12-26 00:47:15,240 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-26 00:47:15,240 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2024-12-26 00:47:15,240 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Repository: ome/omero-rois
2024-12-26 00:47:15,240 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Repository: ome/omero-signup
2024-12-26 00:47:15,240 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,240 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2024-12-26 00:47:15,240 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-26 00:47:15,240 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-26 00:47:15,240 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,240 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: ome/omero-upload
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 20 jburel 'Build'
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2024-12-26 00:47:15,241 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 18 will-moore 'Build' (status: failure)
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2024-12-26 00:47:15,241 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,241 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2024-12-26 00:47:15,241 [   scc.merge] INFO  
2024-12-26 00:47:15,241 [   scc.merge] INFO  Repository: ome/scripts
2024-12-26 00:47:15,241 [   scc.merge] INFO  Excluded PRs:
2024-12-26 00:47:15,242 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-26 00:47:15,242 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-26 00:47:15,242 [   scc.merge] INFO  Already up to date.
2024-12-26 00:47:15,242 [   scc.merge] INFO  
2024-12-26 00:47:15,242 [   scc.merge] INFO  Merged PRs:
2024-12-26 00:47:15,242 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-26 00:47:15,242 [   scc.merge] INFO  
2024-12-26 00:47:15,242 [   scc.merge] INFO  Conflicting PRs (not included):
2024-12-26 00:47:15,242 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-26 00:47:15,242 [   scc.merge] INFO  
2024-12-26 00:47:15,242 [   scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-26 00:47:15,242 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,247 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-26 00:47:15,247 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,252 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,252 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-26 00:47:15,252 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,257 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,257 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-26 00:47:15,257 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,263 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,264 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-26 00:47:15,264 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,270 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,271 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-26 00:47:15,271 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,277 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,277 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-26 00:47:15,277 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,282 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,282 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-26 00:47:15,282 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,287 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,287 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-26 00:47:15,287 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,293 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,293 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-26 00:47:15,293 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,299 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,299 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-26 00:47:15,299 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,304 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,305 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-26 00:47:15,305 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,309 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,309 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-26 00:47:15,309 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,314 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,314 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-26 00:47:15,314 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,321 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,321 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-26 00:47:15,321 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,327 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,327 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-26 00:47:15,327 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,334 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,334 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-26 00:47:15,334 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,340 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,340 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-26 00:47:15,340 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,346 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,346 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-26 00:47:15,346 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,352 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,352 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-26 00:47:15,352 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,358 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,358 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-26 00:47:15,358 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,363 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,363 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-26 00:47:15,363 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,369 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-26 00:47:15,369 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-26 00:47:15,369 [     scc.git] DEBUG Calling 'git remote'
2024-12-26 00:47:15,374 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
  warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
  warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 6251e0d] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	.eggs/

nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 3899693] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-26 00:48:04,550 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-26 00:48:13,432 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-26 00:48:15,777 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-26 00:48:20,242 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-26 00:48:59,332 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS