Console Output
Skipping 95 KB..
Full Log3 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2024-12-20 00:45:02,268 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:45:02,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-20 00:45:02,268 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:02,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:02,274 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:45:02,280 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:45:02,280 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:45:02,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:45:02,291 [ scc.git] DEBUG Already up to date.
2024-12-20 00:45:02,292 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:45:02,292 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:02,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:02,297 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:45:02,339 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:02,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:02,344 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:45:02,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:45:02,390 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366eb94b20> has no local changes
2024-12-20 00:45:02,391 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:45:02,401 [ scc.git] DEBUG [detached HEAD ecf0708a] merge master -Dorg -Ssuccess-only
2024-12-20 00:45:02,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:45:02,401 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:45:02,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-12-20 00:45:03,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-12-20 00:45:03,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-12-20 00:45:04,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-20 00:45:04,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:05,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-20 00:45:05,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:05,578 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-12-20 00:45:05,578 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:45:05,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-20 00:45:05,578 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:05,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:05,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:45:05,589 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:45:05,589 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:45:05,595 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:45:05,602 [ scc.git] DEBUG Already up to date.
2024-12-20 00:45:05,602 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-20 00:45:05,956 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-20 00:45:05,957 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-12-20 00:45:05,961 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:45:05,961 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:05,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:05,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-20 00:45:05,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:05,979 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-20 00:45:06,105 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-20 00:45:06,106 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:06,109 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-12-20 00:45:06,109 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-20 00:45:06,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:06,248 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:45:06,288 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:06,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:06,293 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:45:06,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:45:06,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366ebd8e50> has no local changes
2024-12-20 00:45:06,339 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:45:06,349 [ scc.git] DEBUG [detached HEAD c6743b6] merge master -Dorg -Ssuccess-only
2024-12-20 00:45:06,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:45:06,349 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:45:06,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-20 00:45:07,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-20 00:45:07,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-20 00:45:07,941 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:08,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-20 00:45:09,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:09,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:10,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-20 00:45:10,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:10,465 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-20 00:45:10,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-20 00:45:10,937 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:11,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-20 00:45:12,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:12,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:13,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-20 00:45:13,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:13,463 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-20 00:45:13,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-20 00:45:13,943 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:14,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-20 00:45:15,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:15,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:16,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-20 00:45:16,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:16,596 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-20 00:45:17,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-20 00:45:17,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-20 00:45:17,496 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:18,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-20 00:45:18,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:19,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:19,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-20 00:45:20,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:20,095 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-20 00:45:20,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-20 00:45:20,583 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:21,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-20 00:45:21,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:22,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:22,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-20 00:45:23,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:23,225 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-20 00:45:23,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-20 00:45:23,745 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:24,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-20 00:45:24,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:25,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:25,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-20 00:45:26,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:26,338 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-20 00:45:26,338 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:45:26,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-20 00:45:26,338 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:26,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:26,345 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:45:26,350 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:45:26,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:45:26,356 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:45:26,361 [ scc.git] DEBUG Already up to date.
2024-12-20 00:45:26,361 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-20 00:45:26,683 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:26,683 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-20 00:45:26,688 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-20 00:45:26,993 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:26,993 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-20 00:45:26,998 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-20 00:45:27,293 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:27,293 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-20 00:45:27,297 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-20 00:45:27,589 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:27,589 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-20 00:45:27,593 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-20 00:45:27,882 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:27,883 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-20 00:45:27,888 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-20 00:45:28,177 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-20 00:45:28,178 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-20 00:45:28,182 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:45:28,182 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:28,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:28,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-20 00:45:28,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:28,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-20 00:45:28,294 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:28,300 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-20 00:45:28,300 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-20 00:45:28,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:28,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-20 00:45:28,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:28,490 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-20 00:45:28,637 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-20 00:45:28,638 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:28,643 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-20 00:45:28,643 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-20 00:45:28,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:28,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-20 00:45:28,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:28,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-20 00:45:28,952 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-20 00:45:28,952 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-20 00:45:28,952 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:45:28,953 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:45:28,960 [ scc.git] DEBUG Calling 'git reset --hard 6dc21fe83354820a5dafe4e91bc9b7803b020b88'
2024-12-20 00:45:28,968 [ scc.git] DEBUG HEAD is now at 6dc21fe merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-20 00:45:29,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:29,221 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-20 00:45:29,227 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-20 00:45:29,233 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2024-12-20 00:45:29,239 [ scc.config] DEBUG Found github.token
2024-12-20 00:45:29,240 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-20 00:45:29,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-20 00:45:29,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:29,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-20 00:45:29,451 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-20 00:45:29,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:29,457 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-20 00:45:29,457 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-20 00:45:29,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:29,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-20 00:45:29,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:29,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-20 00:45:29,757 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-20 00:45:29,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:29,763 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-20 00:45:29,763 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-20 00:45:30,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:30,014 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-20 00:45:30,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:30,026 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-20 00:45:30,155 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-20 00:45:30,155 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-20 00:45:30,155 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:45:30,155 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:45:30,162 [ scc.git] DEBUG Calling 'git reset --hard a5c9205bd1792414628e22baf8fc740439707b11'
2024-12-20 00:45:30,170 [ scc.git] DEBUG HEAD is now at a5c9205 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-20 00:45:30,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:30,402 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-20 00:45:30,408 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-20 00:45:30,414 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2024-12-20 00:45:30,419 [ scc.config] DEBUG Found github.token
2024-12-20 00:45:30,420 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-20 00:45:31,347 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-20 00:45:31,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:45:31,391 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:31,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:31,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:45:31,437 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:45:31,445 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366ebdbf40> has no local changes
2024-12-20 00:45:31,446 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:45:31,455 [ scc.git] DEBUG [detached HEAD 8273076] merge master -Dorg -Ssuccess-only
2024-12-20 00:45:31,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:45:31,455 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:45:31,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-20 00:45:32,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-20 00:45:32,412 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-20 00:45:33,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-20 00:45:33,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:34,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:34,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-20 00:45:34,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:34,855 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-20 00:45:35,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-20 00:45:35,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-20 00:45:36,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-20 00:45:36,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-20 00:45:37,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-20 00:45:37,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:38,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:38,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-20 00:45:39,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:39,180 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-20 00:45:39,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-20 00:45:40,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-20 00:45:40,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-20 00:45:41,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:41,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:45:42,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-20 00:45:42,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:42,624 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-20 00:45:43,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-20 00:45:43,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-20 00:45:44,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-20 00:45:44,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:45,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-20 00:45:45,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:45,458 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-20 00:45:45,458 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:45:45,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-20 00:45:45,459 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:45,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:45,465 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:45:45,471 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:45:45,471 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:45:45,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:45:45,484 [ scc.git] DEBUG Already up to date.
2024-12-20 00:45:45,484 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-20 00:45:47,212 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-20 00:45:47,212 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-20 00:45:47,217 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-20 00:45:48,264 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-20 00:45:48,264 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-20 00:45:48,269 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-20 00:45:48,619 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-20 00:45:48,619 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-20 00:45:48,623 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-20 00:45:48,915 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-20 00:45:48,915 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2024-12-20 00:45:48,920 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:45:48,920 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:48,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:48,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-20 00:45:48,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:48,938 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-20 00:45:48,976 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-20 00:45:48,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:48,981 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-20 00:45:48,981 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-20 00:45:48,981 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-20 00:45:49,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:49,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-20 00:45:49,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:49,139 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-20 00:45:49,338 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-20 00:45:49,338 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-20 00:45:49,338 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-20 00:45:49,339 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-20 00:45:49,339 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:49,343 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-20 00:45:49,344 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-20 00:45:49,344 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-20 00:45:49,344 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-20 00:45:49,344 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-20 00:45:49,344 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-20 00:45:49,344 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-20 00:45:49,344 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-20 00:45:49,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:49,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-20 00:45:49,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:49,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-20 00:45:49,601 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-20 00:45:49,602 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:49,605 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-20 00:45:49,605 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-20 00:45:49,605 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-20 00:45:49,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:49,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-20 00:45:49,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:49,954 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-20 00:45:50,067 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:50,078 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-20 00:45:50,078 [ scc.git] DEBUG package.json | 2 +-
2024-12-20 00:45:50,078 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-20 00:45:50,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:50,307 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:45:50,349 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:50,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:50,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:45:50,399 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:45:50,409 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c337610> has no local changes
2024-12-20 00:45:50,409 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:45:50,423 [ scc.git] DEBUG [detached HEAD 14fc763] merge master -Dorg -Ssuccess-only
2024-12-20 00:45:50,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:45:50,424 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:45:50,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-20 00:45:51,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-20 00:45:51,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-20 00:45:52,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-20 00:45:52,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:53,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-20 00:45:53,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:53,710 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-20 00:45:53,711 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:45:53,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-20 00:45:53,711 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:53,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:53,717 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:45:53,721 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:45:53,721 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:45:53,727 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:45:53,732 [ scc.git] DEBUG Already up to date.
2024-12-20 00:45:53,733 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-20 00:45:54,683 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-20 00:45:54,684 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-20 00:45:54,689 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:45:54,689 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:54,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:54,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-20 00:45:54,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:54,710 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-20 00:45:54,722 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:45:54,726 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-20 00:45:54,726 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-20 00:45:54,726 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-20 00:45:54,726 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-20 00:45:54,726 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-20 00:45:54,726 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-20 00:45:54,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:45:54,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:45:54,918 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:45:54,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:45:54,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:45:54,967 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:45:54,974 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c349bb0> has no local changes
2024-12-20 00:45:54,974 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:45:54,983 [ scc.git] DEBUG [detached HEAD 9b144f8] merge master -Dorg -Ssuccess-only
2024-12-20 00:45:54,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:45:54,983 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:45:55,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-20 00:45:55,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-20 00:45:56,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-20 00:45:56,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-20 00:45:57,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:45:57,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-20 00:45:58,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:45:58,270 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-20 00:45:58,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-20 00:45:59,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-20 00:45:59,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-20 00:46:00,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:00,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-20 00:46:01,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:01,128 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-20 00:46:01,128 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:01,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-20 00:46:01,128 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:01,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:01,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:01,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:01,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:01,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:01,159 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:01,159 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-20 00:46:02,216 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-20 00:46:02,216 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-20 00:46:02,221 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-20 00:46:02,971 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-20 00:46:02,971 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-20 00:46:02,977 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:02,977 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:02,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:02,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-20 00:46:02,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:02,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-20 00:46:03,098 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-20 00:46:03,098 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-20 00:46:03,098 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-20 00:46:03,098 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-20 00:46:03,098 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:03,098 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:03,105 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-20 00:46:03,113 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-20 00:46:03,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:03,252 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-20 00:46:03,260 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-20 00:46:03,318 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-12-20 00:46:03,324 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:03,324 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-20 00:46:03,324 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-20 00:46:03,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:03,336 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-20 00:46:03,395 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-20 00:46:03,395 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-20 00:46:03,395 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-20 00:46:03,395 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:03,395 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:03,402 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-20 00:46:03,411 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-20 00:46:03,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:03,643 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-20 00:46:03,651 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-20 00:46:03,657 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-20 00:46:03,663 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:03,664 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-20 00:46:03,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:03,704 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:03,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:03,711 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:03,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:03,764 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2f1880> has no local changes
2024-12-20 00:46:03,764 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:03,777 [ scc.git] DEBUG [detached HEAD d62b43f] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:03,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:03,777 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:04,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-20 00:46:04,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-20 00:46:05,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-20 00:46:05,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-20 00:46:06,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-20 00:46:06,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-20 00:46:07,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-20 00:46:07,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-20 00:46:07,588 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:07,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-20 00:46:07,589 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:07,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:07,595 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:07,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:07,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:07,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:07,613 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:07,613 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:07,613 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:07,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:07,618 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:07,657 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:07,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:07,663 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:07,701 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:07,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2f1670> has no local changes
2024-12-20 00:46:07,707 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:07,715 [ scc.git] DEBUG [detached HEAD 72bfbbc] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:07,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:07,716 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:08,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2024-12-20 00:46:08,016 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:08,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-20 00:46:08,017 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:08,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:08,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:08,027 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:08,027 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:08,032 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:08,037 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:08,038 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:08,038 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:08,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:08,042 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:08,081 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:08,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:08,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:08,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:08,129 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c351df0> has no local changes
2024-12-20 00:46:08,130 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:08,138 [ scc.git] DEBUG [detached HEAD 477f6bb] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:08,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:08,139 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:08,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-20 00:46:08,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-20 00:46:09,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-20 00:46:09,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-20 00:46:10,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:10,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-20 00:46:11,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:11,278 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-20 00:46:11,278 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:11,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-20 00:46:11,278 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:11,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:11,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:11,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:11,289 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:11,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:11,305 [ scc.git] DEBUG Updating 7c7ed9a..bdfeb5e
2024-12-20 00:46:11,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls/31 HTTP/1.1" 200 None
2024-12-20 00:46:12,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls/30 HTTP/1.1" 200 None
2024-12-20 00:46:12,430 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-20 00:46:12,928 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-20 00:46:12,929 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-20 00:46:12,934 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:12,934 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:12,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:12,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-20 00:46:12,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:12,955 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-20 00:46:12,966 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-20 00:46:12,967 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:46:12,969 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-20 00:46:12,969 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-20 00:46:13,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:13,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:13,143 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:13,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:13,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:13,189 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:13,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c31d730> has no local changes
2024-12-20 00:46:13,197 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Updating 7c7ed9a..bdfeb5e
Previously merged:
- PR 31 jburel 'Install sphinx'
- PR 30 jburel 'Add readthedoc config file'
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:13,208 [ scc.git] DEBUG [detached HEAD 3838134] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:13,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:13,209 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:13,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-20 00:46:14,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-20 00:46:14,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-20 00:46:15,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-20 00:46:15,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:16,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-20 00:46:16,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:16,548 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-20 00:46:16,548 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:16,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-20 00:46:16,548 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:16,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:16,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:16,558 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:16,558 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:16,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:16,569 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:16,569 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-20 00:46:16,953 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-20 00:46:16,953 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-20 00:46:16,957 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:16,957 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:16,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:16,963 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-20 00:46:16,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:16,973 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-20 00:46:17,013 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG Auto-merging setup.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-20 00:46:17,013 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:17,014 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:17,020 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-20 00:46:17,026 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2024-12-20 00:46:17,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:17,164 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-20 00:46:17,173 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-20 00:46:17,180 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-12-20 00:46:17,185 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:17,185 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-20 00:46:17,185 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:17,223 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:17,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:17,229 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:17,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:17,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c31d610> has no local changes
2024-12-20 00:46:17,273 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:17,282 [ scc.git] DEBUG [detached HEAD cd2f2b1] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:17,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:17,282 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:17,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-20 00:46:18,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-20 00:46:18,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-20 00:46:19,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-20 00:46:19,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:20,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:46:20,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-20 00:46:21,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-20 00:46:21,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-20 00:46:22,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-20 00:46:22,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-20 00:46:23,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:23,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-20 00:46:23,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:23,953 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-20 00:46:23,953 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:23,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-20 00:46:23,953 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:23,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:23,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:23,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:23,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:23,970 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:23,976 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:23,976 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-20 00:46:24,358 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-20 00:46:24,359 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-20 00:46:24,363 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:24,364 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:24,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:24,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-20 00:46:24,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:24,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-20 00:46:24,411 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-20 00:46:24,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-20 00:46:24,417 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-20 00:46:24,418 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-20 00:46:24,418 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-20 00:46:24,418 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-20 00:46:24,418 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-20 00:46:24,418 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-20 00:46:24,418 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-20 00:46:24,419 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-20 00:46:24,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:24,694 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:24,738 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:24,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:24,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:24,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:24,791 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2f2c70> has no local changes
2024-12-20 00:46:24,791 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:24,801 [ scc.git] DEBUG [detached HEAD f8b9c58] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:24,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:24,801 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:25,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-20 00:46:25,134 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:25,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-20 00:46:25,134 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:25,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:25,140 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:25,145 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:25,145 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:25,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:25,157 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:25,157 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:25,157 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:25,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:25,163 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:25,203 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:25,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:25,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:25,251 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:25,258 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c340f40> has no local changes
2024-12-20 00:46:25,258 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:25,266 [ scc.git] DEBUG [detached HEAD 64fc09f] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:25,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:25,267 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:25,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-20 00:46:26,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-20 00:46:26,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2024-12-20 00:46:27,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-20 00:46:27,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:28,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:46:28,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-20 00:46:28,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:28,988 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-20 00:46:28,988 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:28,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-20 00:46:28,989 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:28,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:28,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:29,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:29,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:29,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:29,013 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:29,013 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-20 00:46:29,613 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-20 00:46:29,613 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-20 00:46:29,618 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:29,618 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:29,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:29,624 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-20 00:46:29,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:29,637 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-20 00:46:29,713 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:46:29,716 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-20 00:46:29,716 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-20 00:46:29,716 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-20 00:46:29,716 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-20 00:46:29,716 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-20 00:46:29,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:29,852 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:29,896 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:29,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:29,903 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:29,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:29,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2d6f70> has no local changes
2024-12-20 00:46:29,954 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:29,962 [ scc.git] DEBUG [detached HEAD 3fc79b6] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:29,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:29,963 [ scc.git] INFO Overriding base-branch from master to main
2024-12-20 00:46:29,963 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:30,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-20 00:46:30,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-20 00:46:31,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-20 00:46:31,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-20 00:46:32,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:32,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:46:33,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-20 00:46:33,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-20 00:46:34,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-20 00:46:34,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-20 00:46:35,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:35,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-20 00:46:36,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:36,045 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-20 00:46:36,045 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:36,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-20 00:46:36,045 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:36,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:36,051 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-20 00:46:36,056 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:36,056 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-20 00:46:36,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-20 00:46:36,067 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:36,067 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-20 00:46:36,531 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-20 00:46:36,531 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-20 00:46:36,536 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:36,536 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:36,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:36,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-20 00:46:36,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:36,553 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-20 00:46:36,727 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-20 00:46:36,727 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-20 00:46:36,727 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:36,728 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:36,734 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-20 00:46:36,741 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2024-12-20 00:46:36,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:36,906 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-20 00:46:36,912 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-20 00:46:36,917 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-20 00:46:36,922 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:36,922 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-20 00:46:36,922 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:36,960 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:36,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:36,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:37,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:37,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c290af0> has no local changes
2024-12-20 00:46:37,009 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:37,016 [ scc.git] DEBUG [detached HEAD 5d8e0da] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:37,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:37,017 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:37,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-20 00:46:37,319 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:37,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-20 00:46:37,319 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,324 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:37,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:37,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:37,335 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:37,342 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:37,342 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:37,342 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:37,388 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,394 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:37,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:37,442 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c290a30> has no local changes
2024-12-20 00:46:37,442 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:37,451 [ scc.git] DEBUG [detached HEAD b9c7d18] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:37,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:37,452 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:37,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-20 00:46:37,736 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:37,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-20 00:46:37,736 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:37,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:37,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:37,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:37,757 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:37,758 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:37,758 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,762 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:37,800 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:37,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:37,805 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:37,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:37,851 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2368b0> has no local changes
2024-12-20 00:46:37,851 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:37,859 [ scc.git] DEBUG [detached HEAD 5f8da58] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:37,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:37,860 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:38,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-20 00:46:38,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-20 00:46:39,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-20 00:46:39,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-20 00:46:40,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:40,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-20 00:46:41,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:41,025 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-20 00:46:41,025 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:41,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-20 00:46:41,026 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:41,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:41,032 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-20 00:46:41,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:41,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-20 00:46:41,043 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-20 00:46:41,049 [ scc.git] DEBUG Already up to date.
2024-12-20 00:46:41,050 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-20 00:46:41,370 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-20 00:46:41,371 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-20 00:46:41,376 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:41,376 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:41,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:41,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-20 00:46:41,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:41,391 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-20 00:46:41,510 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-20 00:46:41,510 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-20 00:46:41,511 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:41,511 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:41,518 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-20 00:46:41,525 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-20 00:46:41,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:41,670 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-20 00:46:41,676 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-20 00:46:41,682 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-20 00:46:41,687 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:41,687 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-20 00:46:41,688 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:41,730 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:41,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:41,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:41,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:41,787 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2365b0> has no local changes
2024-12-20 00:46:41,787 [ 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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:41,797 [ scc.git] DEBUG [detached HEAD 6fc49da] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:41,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:41,798 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-20 00:46:41,798 [ scc.repo] DEBUG ## PRs found:
2024-12-20 00:46:42,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-20 00:46:42,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-20 00:46:43,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-20 00:46:43,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-20 00:46:43,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:44,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-20 00:46:44,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-20 00:46:45,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:45,280 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-20 00:46:45,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-20 00:46:46,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-20 00:46:46,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-20 00:46:47,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-20 00:46:47,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-20 00:46:47,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-20 00:46:47,956 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-20 00:46:48,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-20 00:46:49,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-20 00:46:49,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-20 00:46:50,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-20 00:46:50,043 [ scc.repo] DEBUG ## Branches found:
2024-12-20 00:46:50,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-20 00:46:50,043 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:50,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:50,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-20 00:46:50,061 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-20 00:46:50,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-20 00:46:50,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-20 00:46:50,380 [ scc.git] DEBUG Updating 312afbe..4b4c755
2024-12-20 00:46:50,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/216 HTTP/1.1" 200 None
2024-12-20 00:46:50,865 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-20 00:46:51,294 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-20 00:46:51,294 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-20 00:46:51,299 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-20 00:46:51,884 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-20 00:46:51,885 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-20 00:46:51,889 [ scc.git] DEBUG ## Unique users: []
2024-12-20 00:46:51,890 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:51,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:51,897 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-20 00:46:51,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:51,912 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-20 00:46:52,025 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2024-12-20 00:46:52,025 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-20 00:46:52,026 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-20 00:46:52,034 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-20 00:46:52,041 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2024-12-20 00:46:52,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:52,174 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-20 00:46:52,184 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-20 00:46:52,191 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#284](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-20 00:46:52,195 [ scc.config] DEBUG Found github.token
2024-12-20 00:46:52,196 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-20 00:46:52,196 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-20 00:46:52,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:52,208 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-20 00:46:52,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-20 00:46:52,233 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-20 00:46:52,233 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-20 00:46:52,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:52,566 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-20 00:46:52,613 [ scc.git] DEBUG Get sha1 of %s
2024-12-20 00:46:52,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-20 00:46:52,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:52,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:46:52,677 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f366c2aff10> has no local changes
2024-12-20 00:46:52,678 [ 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)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:46:52,687 [ scc.git] DEBUG [detached HEAD 6f1dea5] merge master -Dorg -Ssuccess-only
2024-12-20 00:46:52,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:46:52,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-20 00:46:52,769 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-20 00:46:52,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:52,967 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-20 00:46:52,972 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-20 00:46:53,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:53,389 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-20 00:46:53,394 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-20 00:46:53,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:53,789 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-20 00:46:53,794 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-20 00:46:54,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:54,197 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-20 00:46:54,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:54,574 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-20 00:46:54,579 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-20 00:46:54,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:54,964 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-20 00:46:54,968 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-20 00:46:55,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:55,358 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-20 00:46:55,362 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-20 00:46:55,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:55,745 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-20 00:46:55,750 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-20 00:46:56,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:56,163 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-20 00:46:56,168 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-20 00:46:56,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:56,551 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-20 00:46:56,556 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-20 00:46:56,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:56,944 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-20 00:46:56,949 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-20 00:46:57,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:57,352 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-20 00:46:57,356 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-20 00:46:57,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:57,746 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-20 00:46:58,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:58,131 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-20 00:46:58,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:58,551 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-20 00:46:58,555 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-20 00:46:58,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:58,943 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-20 00:46:59,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:59,330 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-20 00:46:59,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:46:59,714 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-20 00:46:59,719 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-20 00:47:00,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:47:00,101 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-20 00:47:00,106 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-20 00:47:00,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:47:00,487 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-20 00:47:00,493 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-20 00:47:00,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:47:00,900 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-20 00:47:00,906 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-20 00:47:01,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-20 00:47:01,294 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-20 00:47:01,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-20 00:47:01,382 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3672003ee0> has local changes
2024-12-20 00:47:01,382 [ 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 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
- PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
- PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
- PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
- PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
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
Updating 7c7ed9a..bdfeb5e
Previously merged:
- PR 31 jburel 'Install sphinx'
- PR 30 jburel 'Add readthedoc config file'
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)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
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#284 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/284/)'
2024-12-20 00:47:01,396 [ scc.git] DEBUG [detached HEAD 2077327] merge master -Dorg -Ssuccess-only
2024-12-20 00:47:01,397 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-20 00:47:01,397 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-20 00:47:01,397 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,397 [ scc.merge] INFO
2024-12-20 00:47:01,397 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,397 [ scc.merge] INFO - PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
2024-12-20 00:47:01,397 [ scc.merge] INFO - PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
2024-12-20 00:47:01,397 [ scc.merge] INFO - PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
2024-12-20 00:47:01,397 [ scc.merge] INFO - PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
2024-12-20 00:47:01,397 [ scc.merge] INFO - PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
2024-12-20 00:47:01,397 [ scc.merge] INFO
2024-12-20 00:47:01,397 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-20 00:47:01,397 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,397 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-20 00:47:01,398 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-20 00:47:01,398 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-20 00:47:01,398 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-20 00:47:01,398 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-20 00:47:01,398 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-20 00:47:01,398 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-20 00:47:01,398 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-20 00:47:01,398 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-20 00:47:01,398 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO
2024-12-20 00:47:01,398 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-20 00:47:01,399 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-20 00:47:01,399 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-20 00:47:01,399 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-20 00:47:01,399 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-20 00:47:01,399 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-20 00:47:01,399 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,399 [ scc.merge] INFO
2024-12-20 00:47:01,399 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,399 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-20 00:47:01,400 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-20 00:47:01,400 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-20 00:47:01,400 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-20 00:47:01,400 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO
2024-12-20 00:47:01,400 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-20 00:47:01,400 [ scc.merge] INFO Updating 7c7ed9a..bdfeb5e
2024-12-20 00:47:01,400 [ scc.merge] INFO Previously merged:
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 31 jburel 'Install sphinx'
2024-12-20 00:47:01,400 [ scc.merge] INFO - PR 30 jburel 'Add readthedoc config file'
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-20 00:47:01,401 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-20 00:47:01,401 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-20 00:47:01,401 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-20 00:47:01,401 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-20 00:47:01,401 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-20 00:47:01,401 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-20 00:47:01,401 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-20 00:47:01,401 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,401 [ scc.merge] INFO
2024-12-20 00:47:01,401 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-20 00:47:01,402 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-20 00:47:01,402 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-20 00:47:01,402 [ scc.merge] INFO Already up to date.
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Repository: ome/scripts
2024-12-20 00:47:01,402 [ scc.merge] INFO Excluded PRs:
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-20 00:47:01,402 [ scc.merge] INFO Updating 312afbe..4b4c755
2024-12-20 00:47:01,402 [ scc.merge] INFO Previously merged:
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement'
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Merged PRs:
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-20 00:47:01,402 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-20 00:47:01,402 [ scc.merge] INFO
2024-12-20 00:47:01,402 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-20 00:47:01,402 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-20 00:47:01,409 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-20 00:47:01,414 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-20 00:47:01,419 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-20 00:47:01,425 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-20 00:47:01,430 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-20 00:47:01,436 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-20 00:47:01,441 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-20 00:47:01,446 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-20 00:47:01,451 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-20 00:47:01,456 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-20 00:47:01,461 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-20 00:47:01,466 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-20 00:47:01,471 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-20 00:47:01,476 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-20 00:47:01,482 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-20 00:47:01,487 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-20 00:47:01,492 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-20 00:47:01,498 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-20 00:47:01,505 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-20 00:47:01,510 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-20 00:47:01,516 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-20 00:47:01,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-20 00:47:01,522 [ scc.git] DEBUG Calling 'git remote'
2024-12-20 00:47:01,526 [ 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 9baf724] 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 7c7ed9a
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 312afbe
nothing to commit, working tree clean
[detached HEAD cc0fb58] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-20 00:47:48,021 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-20 00:47:56,908 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-20 00:47:59,222 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-20 00:48:03,705 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-20 00:48:43,102 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/4f42acd4/images/svgs/logo.svg){kind=logo}
