Console Output
Skipping 78 KB..
Full Log,165 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2025-01-04 00:43:44,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:43:44,503 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:43:44,546 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:44,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:44,552 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:43:44,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:43:44,601 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a6ec4f0> has no local changes
2025-01-04 00:43:44,602 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
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'
Generated by OMERO-plugins-push#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:43:44,611 [ scc.git] DEBUG [detached HEAD fb92678] merge master -Dorg -Ssuccess-only
2025-01-04 00:43:44,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:43:44,612 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:43:45,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2025-01-04 00:43:45,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2025-01-04 00:43:45,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2025-01-04 00:43:46,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2025-01-04 00:43:46,460 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:43:46,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-04 00:43:46,460 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:46,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:46,467 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:43:46,473 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:43:46,473 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:43:46,480 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:43:46,488 [ scc.git] DEBUG Already up to date.
2025-01-04 00:43:46,488 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:43:46,488 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:46,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:46,494 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:43:46,533 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:46,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:46,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:43:46,577 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:43:46,584 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a70b880> has no local changes
2025-01-04 00:43:46,584 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:43:46,593 [ scc.git] DEBUG [detached HEAD 39fb4088] merge master -Dorg -Ssuccess-only
2025-01-04 00:43:46,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:43:46,593 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:43:46,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-04 00:43:47,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-04 00:43:47,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-04 00:43:48,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-04 00:43:48,848 [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
2025-01-04 00:43:49,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-04 00:43:49,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:43:49,749 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-04 00:43:49,749 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:43:49,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-04 00:43:49,749 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:49,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:49,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:43:49,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:43:49,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:43:49,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:43:49,773 [ scc.git] DEBUG Already up to date.
2025-01-04 00:43:49,773 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-04 00:43:50,097 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-04 00:43:50,098 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-04 00:43:50,103 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:43:50,103 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:50,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:50,109 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-04 00:43:50,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:50,121 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-04 00:43:50,130 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-04 00:43:50,131 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:43:50,133 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-04 00:43:50,133 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-04 00:43:50,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:43:50,264 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:43:50,306 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:43:50,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:43:50,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:43:50,361 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:43:50,368 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a6e39a0> has no local changes
2025-01-04 00:43:50,368 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:43:50,378 [ scc.git] DEBUG [detached HEAD c3c86bb] merge master -Dorg -Ssuccess-only
2025-01-04 00:43:50,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:43:50,378 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:43:50,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-04 00:43:51,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-04 00:43:51,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-04 00:43:52,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-04 00:43:52,324 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:43:52,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-04 00:43:53,446 [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
2025-01-04 00:43:53,970 [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
2025-01-04 00:43:54,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-04 00:43:54,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:43:54,825 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-04 00:43:55,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-04 00:43:55,292 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:43:55,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-04 00:43:56,314 [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
2025-01-04 00:43:56,811 [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
2025-01-04 00:43:57,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-04 00:43:57,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:43:57,750 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-04 00:43:58,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-04 00:43:58,203 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:43:58,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-04 00:43:59,236 [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
2025-01-04 00:43:59,752 [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
2025-01-04 00:44:00,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-04 00:44:00,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:00,641 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-04 00:44:01,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-04 00:44:01,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-04 00:44:01,577 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:44:02,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-04 00:44:02,651 [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
2025-01-04 00:44:03,144 [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
2025-01-04 00:44:03,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-04 00:44:04,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:04,102 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-04 00:44:04,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-04 00:44:04,553 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:44:05,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-04 00:44:05,615 [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
2025-01-04 00:44:06,078 [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
2025-01-04 00:44:06,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-04 00:44:07,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:07,028 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-04 00:44:07,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-04 00:44:07,481 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:44:08,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-04 00:44:08,534 [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
2025-01-04 00:44:09,011 [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
2025-01-04 00:44:09,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-04 00:44:09,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:09,967 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-04 00:44:09,967 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:09,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-04 00:44:09,967 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:09,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:09,973 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:09,978 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:09,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:09,983 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:09,989 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:09,990 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-04 00:44:10,293 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:10,293 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-04 00:44:10,298 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-04 00:44:10,624 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:10,625 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-04 00:44:10,629 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-04 00:44:10,926 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:10,926 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-04 00:44:10,931 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-04 00:44:11,221 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:11,222 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-04 00:44:11,227 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-04 00:44:11,511 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:11,512 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-04 00:44:11,517 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-04 00:44:11,799 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-04 00:44:11,799 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-04 00:44:11,805 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:11,806 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:11,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:11,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-04 00:44:11,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:11,826 [ 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'
2025-01-04 00:44:11,838 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:11,843 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-04 00:44:11,843 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-04 00:44:11,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:11,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-04 00:44:11,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:11,994 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-04 00:44:12,014 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-04 00:44:12,014 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:12,020 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-04 00:44:12,020 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-04 00:44:12,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:12,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-04 00:44:12,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:12,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-04 00:44:12,460 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-04 00:44:12,460 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-04 00:44:12,460 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:44:12,461 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:44:12,469 [ scc.git] DEBUG Calling 'git reset --hard 39d2918177d3cbf7b15b642e989b5c75cd82ce7a'
2025-01-04 00:44:12,477 [ scc.git] DEBUG HEAD is now at 39d2918 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-04 00:44:12,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:12,766 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-04 00:44:12,773 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-04 00:44:12,778 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/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
2025-01-04 00:44:12,784 [ scc.config] DEBUG Found github.token
2025-01-04 00:44:12,784 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-04 00:44:12,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-04 00:44:12,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:12,795 [ 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'
2025-01-04 00:44:12,880 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-04 00:44:12,881 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:12,886 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-04 00:44:12,886 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-04 00:44:13,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:13,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-04 00:44:13,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:13,204 [ 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'
2025-01-04 00:44:13,222 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-04 00:44:13,222 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:13,227 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-04 00:44:13,227 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-04 00:44:13,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:13,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-04 00:44:13,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:13,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-04 00:44:13,650 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-04 00:44:13,650 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-04 00:44:13,650 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:44:13,651 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:44:13,657 [ scc.git] DEBUG Calling 'git reset --hard 4090105d9b29ef308d97d96eaf22a3d0e833969f'
2025-01-04 00:44:13,664 [ scc.git] DEBUG HEAD is now at 4090105 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-04 00:44:13,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:13,923 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-04 00:44:13,929 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-04 00:44:13,935 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/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
2025-01-04 00:44:13,941 [ scc.config] DEBUG Found github.token
2025-01-04 00:44:13,941 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-04 00:44:13,941 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:13,983 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:13,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:13,989 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:14,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:14,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a6d6b20> has no local changes
2025-01-04 00:44:14,039 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:14,049 [ scc.git] DEBUG [detached HEAD 4817012] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:14,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:14,049 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:14,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-04 00:44:14,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-04 00:44:14,930 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-04 00:44:15,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-04 00:44:16,031 [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
2025-01-04 00:44:16,562 [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
2025-01-04 00:44:17,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-04 00:44:17,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:17,425 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-04 00:44:17,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-04 00:44:18,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-04 00:44:18,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-04 00:44:19,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-04 00:44:19,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-04 00:44:20,229 [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
2025-01-04 00:44:20,662 [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
2025-01-04 00:44:21,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-04 00:44:21,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:21,543 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-04 00:44:21,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-04 00:44:22,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-04 00:44:22,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-04 00:44:23,455 [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
2025-01-04 00:44:23,955 [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
2025-01-04 00:44:24,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-04 00:44:24,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:24,839 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-04 00:44:25,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-04 00:44:25,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-04 00:44:26,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-04 00:44:26,733 [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
2025-01-04 00:44:27,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-04 00:44:27,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:27,614 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-04 00:44:27,614 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:27,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-04 00:44:27,614 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:27,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:27,622 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:27,631 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:27,631 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:27,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:27,653 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:27,654 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-04 00:44:29,129 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-04 00:44:29,130 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-04 00:44:29,135 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-04 00:44:30,094 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-04 00:44:30,094 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-04 00:44:30,099 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-04 00:44:30,491 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-04 00:44:30,491 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-04 00:44:30,496 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-04 00:44:30,777 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-04 00:44:30,777 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-04 00:44:30,781 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:30,781 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:30,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:30,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-04 00:44:30,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:30,799 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-04 00:44:30,969 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-04 00:44:30,970 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:30,974 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-04 00:44:30,974 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-04 00:44:30,974 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-04 00:44:31,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:31,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-04 00:44:31,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:31,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-04 00:44:31,766 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-04 00:44:31,767 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-04 00:44:31,767 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-04 00:44:31,767 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-04 00:44:31,767 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:31,772 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-04 00:44:31,772 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-04 00:44:31,772 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-04 00:44:31,772 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-04 00:44:31,772 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-04 00:44:31,772 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-04 00:44:31,772 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-04 00:44:31,772 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-04 00:44:31,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:31,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-04 00:44:31,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:31,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-04 00:44:32,292 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-04 00:44:32,293 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:32,296 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-04 00:44:32,297 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-04 00:44:32,297 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-04 00:44:32,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:32,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-04 00:44:32,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:32,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-04 00:44:32,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:32,619 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-04 00:44:32,619 [ scc.git] DEBUG package.json | 2 +-
2025-01-04 00:44:32,619 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-04 00:44:32,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:32,823 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:32,863 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:32,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:32,869 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:32,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:32,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a6cce80> has no local changes
2025-01-04 00:44:32,917 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:32,930 [ scc.git] DEBUG [detached HEAD 2ce7212] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:32,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:32,931 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:33,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-04 00:44:33,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-04 00:44:34,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-04 00:44:34,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-04 00:44:35,318 [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
2025-01-04 00:44:35,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-04 00:44:36,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:36,155 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-04 00:44:36,155 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:36,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-04 00:44:36,156 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:36,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:36,164 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:36,169 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:36,169 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:36,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:36,181 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:36,181 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-04 00:44:36,513 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-04 00:44:36,513 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-04 00:44:36,518 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:36,518 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:36,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:36,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-04 00:44:36,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:36,535 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-04 00:44:36,553 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:36,556 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-04 00:44:36,556 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-04 00:44:36,556 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-04 00:44:36,556 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-04 00:44:36,556 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-04 00:44:36,556 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-04 00:44:36,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:36,731 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:36,772 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:36,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:36,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:36,819 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:36,826 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47686695b0> has no local changes
2025-01-04 00:44:36,826 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:36,835 [ scc.git] DEBUG [detached HEAD 6bc4d91] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:36,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:36,836 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:37,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-04 00:44:37,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-04 00:44:38,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-04 00:44:38,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-04 00:44:39,163 [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
2025-01-04 00:44:39,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-04 00:44:40,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:40,010 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-04 00:44:40,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-04 00:44:40,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-04 00:44:41,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-04 00:44:41,796 [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
2025-01-04 00:44:42,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-04 00:44:42,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:42,637 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-04 00:44:42,637 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:42,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-04 00:44:42,637 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:42,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:42,645 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:42,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:42,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:42,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:42,664 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:42,664 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-04 00:44:43,254 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-04 00:44:43,254 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-04 00:44:43,259 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-04 00:44:43,677 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-04 00:44:43,677 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-04 00:44:43,683 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:43,683 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:43,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:43,689 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-04 00:44:43,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:43,705 [ 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'
2025-01-04 00:44:44,087 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-04 00:44:44,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-04 00:44:44,087 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-04 00:44:44,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-04 00:44:44,087 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:44:44,088 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:44:44,096 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-04 00:44:44,104 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-04 00:44:44,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:44,242 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-04 00:44:44,250 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-04 00:44:44,278 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-04 00:44:44,284 [ scc.config] DEBUG Found github.token
2025-01-04 00:44:44,284 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-04 00:44:44,284 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-04 00:44:44,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:44,296 [ 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'
2025-01-04 00:44:44,382 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-04 00:44:44,382 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-04 00:44:44,382 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-04 00:44:44,382 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:44:44,383 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:44:44,389 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-04 00:44:44,397 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-04 00:44:44,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:44,624 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-04 00:44:44,633 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-04 00:44:44,639 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/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
2025-01-04 00:44:44,644 [ scc.config] DEBUG Found github.token
2025-01-04 00:44:44,644 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-04 00:44:44,645 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:44,684 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:44,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:44,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:44,733 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:44,741 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476867db80> has no local changes
2025-01-04 00:44:44,741 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:44,751 [ scc.git] DEBUG [detached HEAD 3f56105] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:44,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:44,752 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:45,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-04 00:44:45,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-04 00:44:46,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-04 00:44:46,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-04 00:44:46,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-04 00:44:47,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-04 00:44:47,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-04 00:44:48,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-04 00:44:48,511 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:48,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-04 00:44:48,511 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,517 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:48,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:48,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:48,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:48,534 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:48,535 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:48,535 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,540 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:48,579 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,585 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:48,625 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:48,632 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476a6b6f40> has no local changes
2025-01-04 00:44:48,632 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:48,641 [ scc.git] DEBUG [detached HEAD 6a2ead7] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:48,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:48,641 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:48,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-04 00:44:48,887 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:48,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-04 00:44:48,887 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,893 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:48,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:48,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:48,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:48,909 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:48,909 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:48,909 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,914 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:48,952 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:48,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:48,958 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:49,012 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:49,020 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476861f940> has no local changes
2025-01-04 00:44:49,021 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:49,029 [ scc.git] DEBUG [detached HEAD 2b5d2fa] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:49,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:49,030 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:49,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-04 00:44:49,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-04 00:44:50,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-04 00:44:50,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-04 00:44:51,332 [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
2025-01-04 00:44:51,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-04 00:44:52,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:52,340 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-04 00:44:52,340 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:52,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-04 00:44:52,340 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:52,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:52,346 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:52,352 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:52,352 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:52,358 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:52,364 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:52,364 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-04 00:44:52,705 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-04 00:44:52,706 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-04 00:44:52,711 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:52,711 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:52,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:52,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-04 00:44:52,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:52,732 [ 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'
2025-01-04 00:44:52,747 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-04 00:44:52,748 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:44:52,751 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-04 00:44:52,751 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-04 00:44:52,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:52,885 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:52,931 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:52,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:52,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:52,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:52,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685d95e0> has no local changes
2025-01-04 00:44:52,986 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:52,995 [ scc.git] DEBUG [detached HEAD 65e7c56] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:52,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:52,996 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:53,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-04 00:44:53,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-04 00:44:54,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-04 00:44:54,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-04 00:44:55,350 [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
2025-01-04 00:44:55,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-04 00:44:56,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:44:56,295 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-04 00:44:56,295 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:44:56,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-04 00:44:56,295 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:56,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:56,302 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:44:56,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:44:56,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:44:56,313 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:44:56,318 [ scc.git] DEBUG Already up to date.
2025-01-04 00:44:56,318 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-04 00:44:56,699 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-04 00:44:56,700 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-04 00:44:56,704 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:44:56,705 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:56,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:56,710 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-04 00:44:56,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:56,721 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-04 00:44:56,767 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG Auto-merging setup.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-04 00:44:56,768 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:44:56,768 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:44:56,775 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-04 00:44:56,782 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-04 00:44:56,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:44:56,939 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-04 00:44:56,947 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-04 00:44:57,051 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-01-04 00:44:57,056 [ scc.config] DEBUG Found github.token
2025-01-04 00:44:57,057 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-04 00:44:57,057 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:44:57,095 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:44:57,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:44:57,101 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:44:57,140 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:44:57,147 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685d97f0> has no local changes
2025-01-04 00:44:57,147 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:44:57,155 [ scc.git] DEBUG [detached HEAD ed364be] merge master -Dorg -Ssuccess-only
2025-01-04 00:44:57,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:44:57,156 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:44:57,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-04 00:44:57,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-04 00:44:58,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-04 00:44:58,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-04 00:44:59,377 [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
2025-01-04 00:44:59,823 [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
2025-01-04 00:45:00,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-04 00:45:00,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-04 00:45:01,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-04 00:45:01,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-04 00:45:02,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-04 00:45:02,708 [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
2025-01-04 00:45:03,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-04 00:45:03,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:03,632 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-04 00:45:03,632 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:03,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-04 00:45:03,632 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:03,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:03,638 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:03,647 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:03,647 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:03,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:03,661 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:03,661 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-04 00:45:04,125 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-04 00:45:04,125 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-04 00:45:04,130 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:04,130 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:04,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-04 00:45:04,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,156 [ 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'
2025-01-04 00:45:04,269 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-04 00:45:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-04 00:45:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-04 00:45:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-04 00:45:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-04 00:45:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-04 00:45:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-04 00:45:04,276 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-04 00:45:04,276 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-04 00:45:04,276 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-04 00:45:04,277 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-04 00:45:04,277 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-04 00:45:04,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:04,444 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:04,487 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:04,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,494 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:04,536 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:04,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685d9640> has no local changes
2025-01-04 00:45:04,543 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:04,553 [ scc.git] DEBUG [detached HEAD 2047c88] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:04,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:04,554 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:04,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-04 00:45:04,865 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:04,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-04 00:45:04,865 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:04,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:04,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:04,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:04,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:04,892 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:04,893 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:04,893 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:04,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,902 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:04,947 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:04,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:04,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:04,997 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:05,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4768648550> has no local changes
2025-01-04 00:45:05,004 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:05,013 [ scc.git] DEBUG [detached HEAD 72ed86c] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:05,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:05,014 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:05,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-04 00:45:05,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-04 00:45:06,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-04 00:45:06,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-04 00:45:07,392 [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
2025-01-04 00:45:07,898 [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
2025-01-04 00:45:08,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-04 00:45:08,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:08,807 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-04 00:45:08,807 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:08,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-04 00:45:08,807 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:08,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:08,815 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:08,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:08,821 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:08,826 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:08,831 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:08,832 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-04 00:45:09,545 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-04 00:45:09,546 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-04 00:45:09,551 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:09,551 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:09,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:09,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-04 00:45:09,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:09,567 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-04 00:45:09,656 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:45:09,659 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-04 00:45:09,659 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-04 00:45:09,659 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-04 00:45:09,659 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-04 00:45:09,659 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-04 00:45:09,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:09,796 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:09,838 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:09,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:09,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:09,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:09,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4768648790> has no local changes
2025-01-04 00:45:09,891 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:09,899 [ scc.git] DEBUG [detached HEAD ee37582] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:09,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:09,900 [ scc.git] INFO Overriding base-branch from master to main
2025-01-04 00:45:09,900 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:10,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-04 00:45:10,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-04 00:45:11,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-04 00:45:11,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-04 00:45:12,351 [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
2025-01-04 00:45:12,846 [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
2025-01-04 00:45:13,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-04 00:45:13,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-04 00:45:14,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-04 00:45:14,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-04 00:45:15,233 [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
2025-01-04 00:45:15,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-04 00:45:16,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:16,079 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-04 00:45:16,079 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:16,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-04 00:45:16,080 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:16,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:16,086 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-04 00:45:16,092 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:16,092 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-04 00:45:16,097 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-04 00:45:16,104 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:16,104 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-04 00:45:16,474 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-04 00:45:16,474 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-04 00:45:16,479 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:16,479 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:16,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:16,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-04 00:45:16,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:16,496 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-04 00:45:16,709 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-04 00:45:16,709 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-04 00:45:16,709 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:45:16,710 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:45:16,716 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-04 00:45:16,722 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-04 00:45:16,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:16,870 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-04 00:45:16,878 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-04 00:45:16,884 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-04 00:45:16,888 [ scc.config] DEBUG Found github.token
2025-01-04 00:45:16,889 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-04 00:45:16,889 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:16,927 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:16,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:16,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:16,971 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:16,978 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685e4b20> has no local changes
2025-01-04 00:45:16,979 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:16,987 [ scc.git] DEBUG [detached HEAD c888d91] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:16,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:16,988 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:17,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-04 00:45:17,329 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:17,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-04 00:45:17,329 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:17,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:17,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:17,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:17,356 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:17,356 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:17,356 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,362 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:17,406 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,413 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:17,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:17,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685b05b0> has no local changes
2025-01-04 00:45:17,462 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:17,470 [ scc.git] DEBUG [detached HEAD 616b29a] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:17,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:17,471 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:17,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-04 00:45:17,747 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:17,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-04 00:45:17,748 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,754 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:17,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:17,760 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:17,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:17,773 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:17,774 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:17,774 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,780 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:17,822 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:17,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:17,829 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:17,871 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:17,879 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685c2b80> has no local changes
2025-01-04 00:45:17,880 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:17,889 [ scc.git] DEBUG [detached HEAD 80d917f] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:17,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:17,890 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:18,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-04 00:45:18,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-04 00:45:19,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-04 00:45:19,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-04 00:45:20,156 [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
2025-01-04 00:45:20,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-04 00:45:21,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:21,044 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-04 00:45:21,044 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:21,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-04 00:45:21,044 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:21,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:21,051 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-04 00:45:21,057 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:21,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-04 00:45:21,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-04 00:45:21,070 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:21,071 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-04 00:45:21,367 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-04 00:45:21,367 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-04 00:45:21,372 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:21,373 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:21,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:21,380 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-04 00:45:21,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:21,393 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-04 00:45:21,501 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-04 00:45:21,501 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-04 00:45:21,501 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:45:21,501 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:45:21,509 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-04 00:45:21,516 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-04 00:45:21,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:21,661 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-04 00:45:21,670 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-04 00:45:21,677 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-04 00:45:21,683 [ scc.config] DEBUG Found github.token
2025-01-04 00:45:21,683 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-04 00:45:21,683 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:21,727 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:21,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:21,733 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:21,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:21,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4768569af0> has no local changes
2025-01-04 00:45:21,785 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:21,795 [ scc.git] DEBUG [detached HEAD 2212190] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:21,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:21,795 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-04 00:45:21,795 [ scc.repo] DEBUG ## PRs found:
2025-01-04 00:45:22,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-04 00:45:22,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-04 00:45:23,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-04 00:45:23,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-04 00:45:24,042 [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
2025-01-04 00:45:24,492 [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
2025-01-04 00:45:25,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-04 00:45:25,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:25,487 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-04 00:45:25,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-04 00:45:26,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-04 00:45:26,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-04 00:45:27,251 [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
2025-01-04 00:45:27,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-04 00:45:28,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-04 00:45:28,085 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-04 00:45:28,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-04 00:45:29,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-04 00:45:29,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-04 00:45:30,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-04 00:45:30,012 [ scc.repo] DEBUG ## Branches found:
2025-01-04 00:45:30,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-04 00:45:30,012 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:30,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:30,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-04 00:45:30,024 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-04 00:45:30,024 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-04 00:45:30,030 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-04 00:45:30,036 [ scc.git] DEBUG Already up to date.
2025-01-04 00:45:30,036 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-04 00:45:30,983 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-04 00:45:30,983 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-04 00:45:30,993 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-04 00:45:31,319 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-04 00:45:31,319 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-04 00:45:31,324 [ scc.git] DEBUG ## Unique users: []
2025-01-04 00:45:31,324 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:31,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:31,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-04 00:45:31,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:31,345 [ 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'
2025-01-04 00:45:31,385 [ 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.
2025-01-04 00:45:31,386 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-04 00:45:31,386 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-04 00:45:31,393 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-04 00:45:31,399 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-04 00:45:31,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:31,536 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-04 00:45:31,548 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-04 00:45:31,555 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#296](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-04 00:45:31,561 [ scc.config] DEBUG Found github.token
2025-01-04 00:45:31,561 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-04 00:45:31,561 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-04 00:45:31,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:31,573 [ 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'
2025-01-04 00:45:31,641 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-04 00:45:31,644 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-04 00:45:31,644 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-04 00:45:31,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:31,927 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-04 00:45:31,968 [ scc.git] DEBUG Get sha1 of %s
2025-01-04 00:45:31,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-04 00:45:31,976 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:32,019 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:32,026 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f47685696a0> has no local changes
2025-01-04 00:45:32,027 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:32,037 [ scc.git] DEBUG [detached HEAD 945aa2c] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:32,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:32,038 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-04 00:45:32,124 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-04 00:45:32,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:32,335 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-04 00:45:32,341 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-04 00:45:32,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:32,735 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-04 00:45:32,740 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-04 00:45:33,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:33,123 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-04 00:45:33,129 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-04 00:45:33,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:33,516 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-04 00:45:33,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:33,894 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-04 00:45:33,899 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-04 00:45:34,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:34,275 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-04 00:45:34,280 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-04 00:45:34,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:34,675 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-04 00:45:34,679 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-04 00:45:35,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:35,069 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-04 00:45:35,073 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-04 00:45:35,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:35,465 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-04 00:45:35,470 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-04 00:45:35,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:35,872 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-04 00:45:35,876 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-04 00:45:36,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:36,258 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-04 00:45:36,263 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-04 00:45:36,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:36,642 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-04 00:45:36,647 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-04 00:45:37,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:37,028 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-04 00:45:37,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:37,417 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-04 00:45:37,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:37,793 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-04 00:45:37,798 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-04 00:45:38,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:38,187 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-04 00:45:38,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:38,581 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-04 00:45:38,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:38,962 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-04 00:45:38,967 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-04 00:45:39,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:39,353 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-04 00:45:39,359 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-04 00:45:39,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:39,767 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-04 00:45:39,772 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-04 00:45:40,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:40,164 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-04 00:45:40,168 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-04 00:45:40,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-04 00:45:40,551 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-04 00:45:40,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-04 00:45:40,635 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f476b7b7370> has local changes
2025-01-04 00:45:40,636 [ 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#296 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/296/)'
2025-01-04 00:45:40,650 [ scc.git] DEBUG [detached HEAD 1cf0d6c] merge master -Dorg -Ssuccess-only
2025-01-04 00:45:40,651 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-04 00:45:40,651 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-04 00:45:40,651 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,651 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-04 00:45:40,651 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-04 00:45:40,651 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,651 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-04 00:45:40,651 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-04 00:45:40,651 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,651 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-04 00:45:40,651 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,651 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-04 00:45:40,651 [ scc.merge] INFO
2025-01-04 00:45:40,651 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-04 00:45:40,652 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-04 00:45:40,652 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-04 00:45:40,652 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-04 00:45:40,652 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-04 00:45:40,652 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-04 00:45:40,652 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-04 00:45:40,652 [ scc.merge] INFO
2025-01-04 00:45:40,652 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,652 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-04 00:45:40,653 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-04 00:45:40,653 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-04 00:45:40,653 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-04 00:45:40,653 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-04 00:45:40,653 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-04 00:45:40,653 [ scc.merge] INFO
2025-01-04 00:45:40,653 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-04 00:45:40,653 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-04 00:45:40,653 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-04 00:45:40,654 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,654 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,654 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-04 00:45:40,654 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,654 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-04 00:45:40,655 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-04 00:45:40,655 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-04 00:45:40,655 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-04 00:45:40,655 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-04 00:45:40,655 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Repository: ome/scripts
2025-01-04 00:45:40,655 [ scc.merge] INFO Excluded PRs:
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-04 00:45:40,655 [ scc.merge] INFO Already up to date.
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Merged PRs:
2025-01-04 00:45:40,655 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-04 00:45:40,655 [ scc.merge] INFO
2025-01-04 00:45:40,655 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-04 00:45:40,656 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-04 00:45:40,656 [ scc.merge] INFO
2025-01-04 00:45:40,656 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-04 00:45:40,656 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-04 00:45:40,662 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-04 00:45:40,667 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-04 00:45:40,672 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-04 00:45:40,676 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-04 00:45:40,681 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-04 00:45:40,687 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-04 00:45:40,692 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-04 00:45:40,697 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-04 00:45:40,702 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-04 00:45:40,707 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-04 00:45:40,712 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-04 00:45:40,716 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-04 00:45:40,721 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-04 00:45:40,726 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-04 00:45:40,731 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-04 00:45:40,736 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-04 00:45:40,741 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-04 00:45:40,746 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-04 00:45:40,751 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-04 00:45:40,757 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-04 00:45:40,762 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-04 00:45:40,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-04 00:45:40,768 [ scc.git] DEBUG Calling 'git remote'
2025-01-04 00:45:40,774 [ 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 e3c5a0e] 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 6714c4d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-04 00:46:28,241 [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
2025-01-04 00:46:37,022 [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
2025-01-04 00:46:39,394 [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
2025-01-04 00:46:43,905 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-04 00:47:24,720 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci