Console Output
Skipping 84 KB..
Full Log'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 607 Rdornier 'fix NoneType exception on timeincrement'
Generated by OMERO-plugins-push#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 13:59:17,243 [ scc.git] DEBUG [detached HEAD 3cff7029] merge master -Dorg -Ssuccess-only
2025-01-09 13:59:17,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 13:59:17,244 [ scc.repo] DEBUG ## PRs found:
2025-01-09 13:59:17,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-09 13:59:18,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-09 13:59:18,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-09 13:59:19,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-09 13:59:19,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:20,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-09 13:59:20,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:20,638 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-09 13:59:20,638 [ scc.repo] DEBUG ## Branches found:
2025-01-09 13:59:20,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-09 13:59:20,638 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:20,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:20,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 13:59:20,648 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 13:59:20,649 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 13:59:20,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 13:59:20,658 [ scc.git] DEBUG Already up to date.
2025-01-09 13:59:20,659 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-09 13:59:21,044 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-09 13:59:21,045 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-09 13:59:21,048 [ scc.git] DEBUG ## Unique users: []
2025-01-09 13:59:21,048 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:21,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:21,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-09 13:59:21,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:21,063 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-09 13:59:21,134 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-09 13:59:21,135 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 13:59:21,137 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-09 13:59:21,137 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-09 13:59:21,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:21,274 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 13:59:21,310 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:21,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:21,314 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 13:59:21,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 13:59:21,355 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67034d42e0> has no local changes
2025-01-09 13:59:21,355 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 13:59:21,363 [ scc.git] DEBUG [detached HEAD ef65a92] merge master -Dorg -Ssuccess-only
2025-01-09 13:59:21,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 13:59:21,363 [ scc.repo] DEBUG ## PRs found:
2025-01-09 13:59:21,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-09 13:59:22,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-09 13:59:22,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-09 13:59:23,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-09 13:59:23,411 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:23,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-09 13:59:24,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:25,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:25,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-09 13:59:26,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:26,059 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-09 13:59:26,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-09 13:59:26,536 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:27,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-09 13:59:27,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:28,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:28,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-09 13:59:29,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:29,105 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-09 13:59:29,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-09 13:59:29,572 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:30,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-09 13:59:30,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:31,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:31,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-09 13:59:32,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:32,039 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-09 13:59:32,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-09 13:59:32,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-09 13:59:32,989 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:33,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-09 13:59:34,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:34,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:35,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-09 13:59:35,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:35,647 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-09 13:59:36,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-09 13:59:36,140 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:36,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-09 13:59:37,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:37,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:38,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-09 13:59:38,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:38,742 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-09 13:59:39,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-09 13:59:39,271 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:39,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-09 13:59:40,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:40,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:41,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-09 13:59:41,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:41,805 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-09 13:59:41,805 [ scc.repo] DEBUG ## Branches found:
2025-01-09 13:59:41,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-09 13:59:41,806 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:41,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:41,811 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 13:59:41,815 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 13:59:41,815 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 13:59:41,820 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 13:59:41,825 [ scc.git] DEBUG Already up to date.
2025-01-09 13:59:41,825 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-09 13:59:42,168 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:42,168 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-09 13:59:42,171 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-09 13:59:42,453 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:42,453 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-09 13:59:42,456 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-09 13:59:42,754 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:42,754 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-09 13:59:42,757 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-09 13:59:43,036 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:43,036 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-09 13:59:43,040 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-09 13:59:43,339 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:43,339 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-09 13:59:43,343 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-09 13:59:43,639 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-09 13:59:43,639 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-09 13:59:43,642 [ scc.git] DEBUG ## Unique users: []
2025-01-09 13:59:43,642 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:43,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:43,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-09 13:59:43,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:43,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-09 13:59:43,744 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 13:59:43,749 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-09 13:59:43,749 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-09 13:59:43,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:43,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-09 13:59:43,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:43,945 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-09 13:59:44,005 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-09 13:59:44,006 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 13:59:44,010 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-09 13:59:44,010 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-09 13:59:44,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:44,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-09 13:59:44,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:44,337 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-09 13:59:44,416 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-09 13:59:44,416 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-09 13:59:44,416 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 13:59:44,416 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 13:59:44,421 [ scc.git] DEBUG Calling 'git reset --hard 120c694644ef2431c8f228bcc8485dfe557d4222'
2025-01-09 13:59:44,427 [ scc.git] DEBUG HEAD is now at 120c694 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-09 13:59:44,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:44,717 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-09 13:59:44,721 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-09 13:59:44,726 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-09 13:59:44,730 [ scc.config] DEBUG Found github.token
2025-01-09 13:59:44,731 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-09 13:59:44,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-09 13:59:44,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:44,754 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-09 13:59:44,792 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-09 13:59:44,793 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 13:59:44,797 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-09 13:59:44,797 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-09 13:59:45,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:45,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-09 13:59:45,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:45,230 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-09 13:59:45,283 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-09 13:59:45,283 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 13:59:45,287 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-09 13:59:45,287 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-09 13:59:45,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:45,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-09 13:59:45,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:45,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-09 13:59:45,632 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-09 13:59:45,632 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-09 13:59:45,632 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 13:59:45,632 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 13:59:45,637 [ scc.git] DEBUG Calling 'git reset --hard 7cd0f2a3e66ef9d8ac11e39494fd57b945e37b90'
2025-01-09 13:59:45,643 [ scc.git] DEBUG HEAD is now at 7cd0f2a merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-09 13:59:45,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 13:59:45,894 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-09 13:59:45,898 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-09 13:59:45,903 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-09 13:59:45,907 [ scc.config] DEBUG Found github.token
2025-01-09 13:59:45,908 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-09 13:59:45,908 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 13:59:45,944 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 13:59:45,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 13:59:45,948 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 13:59:45,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 13:59:45,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6702403b80> has no local changes
2025-01-09 13:59:45,990 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 13:59:45,999 [ scc.git] DEBUG [detached HEAD 671234b] merge master -Dorg -Ssuccess-only
2025-01-09 13:59:45,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 13:59:45,999 [ scc.repo] DEBUG ## PRs found:
2025-01-09 13:59:46,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-09 13:59:46,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-09 13:59:47,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-09 13:59:47,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:48,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:48,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-09 13:59:49,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:49,383 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-09 13:59:49,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-09 13:59:49,946 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-09 13:59:50,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-09 13:59:51,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:51,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:52,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-09 13:59:52,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:52,466 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-09 13:59:52,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-09 13:59:53,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-09 13:59:53,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-09 13:59:54,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-09 13:59:54,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-09 13:59:55,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:55,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:56,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-09 13:59:56,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-09 13:59:56,686 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-09 13:59:57,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-09 13:59:57,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-09 13:59:58,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-09 13:59:58,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 13:59:59,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 13:59:59,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-09 14:00:00,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:00,106 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-09 14:00:00,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-09 14:00:01,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-09 14:00:01,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-09 14:00:02,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:02,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-09 14:00:02,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:02,946 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-09 14:00:02,946 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:02,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-09 14:00:02,946 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:02,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:02,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:02,956 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:02,956 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:02,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:02,977 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:02,977 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-09 14:00:04,178 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-09 14:00:04,178 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-09 14:00:04,182 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-09 14:00:05,688 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-09 14:00:05,689 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-09 14:00:05,693 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-09 14:00:06,048 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-09 14:00:06,048 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-09 14:00:06,052 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-09 14:00:06,424 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-09 14:00:06,425 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-09 14:00:06,429 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-09 14:00:07,021 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-09 14:00:07,021 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-09 14:00:07,023 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:07,023 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:07,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:07,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-09 14:00:07,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:07,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-09 14:00:07,082 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-09 14:00:07,083 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:07,086 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-09 14:00:07,086 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-09 14:00:07,086 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-09 14:00:07,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:07,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-09 14:00:07,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:07,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-09 14:00:07,413 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-09 14:00:07,413 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-09 14:00:07,413 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-09 14:00:07,413 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-09 14:00:07,414 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:07,418 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-09 14:00:07,418 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-09 14:00:07,418 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-09 14:00:07,418 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-09 14:00:07,418 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-09 14:00:07,418 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-09 14:00:07,418 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-09 14:00:07,418 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-09 14:00:07,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:07,682 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-09 14:00:07,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:07,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-09 14:00:07,770 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-09 14:00:07,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:07,773 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-09 14:00:07,774 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-09 14:00:07,774 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-09 14:00:08,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:08,100 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-09 14:00:08,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:08,124 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-09 14:00:08,220 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:08,230 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-09 14:00:08,230 [ scc.git] DEBUG package.json | 2 +-
2025-01-09 14:00:08,230 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-09 14:00:08,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:08,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-09 14:00:08,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:08,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-09 14:00:08,554 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-09 14:00:08,554 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-09 14:00:08,554 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-09 14:00:08,554 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-09 14:00:08,554 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-09 14:00:08,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:08,559 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-09 14:00:08,559 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-09 14:00:08,559 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-09 14:00:08,559 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-09 14:00:08,559 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-09 14:00:08,559 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-09 14:00:08,559 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-09 14:00:08,559 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-09 14:00:08,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:08,915 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:08,952 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:08,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:08,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:08,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:09,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6702412f40> has no local changes
2025-01-09 14:00:09,001 [ 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'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:09,010 [ scc.git] DEBUG [detached HEAD 830a6e0] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:09,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:09,010 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:09,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-09 14:00:09,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-09 14:00:10,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-09 14:00:11,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-09 14:00:11,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:11,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-09 14:00:12,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:12,421 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-09 14:00:12,421 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:12,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-09 14:00:12,422 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:12,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:12,427 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:12,432 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:12,432 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:12,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:12,443 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:12,443 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-09 14:00:13,019 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-09 14:00:13,020 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-09 14:00:13,023 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:13,024 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:13,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:13,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-09 14:00:13,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:13,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-09 14:00:13,051 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:13,054 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-09 14:00:13,054 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-09 14:00:13,054 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-09 14:00:13,054 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-09 14:00:13,054 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-09 14:00:13,054 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-09 14:00:13,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:13,194 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:13,232 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:13,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:13,237 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:13,272 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:13,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6700378520> has no local changes
2025-01-09 14:00:13,278 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:13,286 [ scc.git] DEBUG [detached HEAD 2780060] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:13,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:13,287 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:13,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-09 14:00:14,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-09 14:00:14,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-09 14:00:15,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-09 14:00:16,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:17,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-09 14:00:17,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:17,941 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-09 14:00:18,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-09 14:00:18,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-09 14:00:19,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-09 14:00:19,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:21,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-09 14:00:21,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:21,419 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-09 14:00:21,419 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:21,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-09 14:00:21,419 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:21,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:21,425 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:21,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:21,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:21,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:21,439 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:21,439 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-09 14:00:22,068 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-09 14:00:22,068 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-09 14:00:22,072 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-09 14:00:22,510 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-09 14:00:22,510 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-09 14:00:22,513 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:22,513 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:22,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:22,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-09 14:00:22,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:22,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-09 14:00:22,594 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-09 14:00:22,594 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-09 14:00:22,594 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-09 14:00:22,595 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-09 14:00:22,595 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:00:22,595 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:00:22,600 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-09 14:00:22,606 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-09 14:00:22,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:22,811 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-09 14:00:22,818 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-09 14:00:22,858 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-09 14:00:22,863 [ scc.config] DEBUG Found github.token
2025-01-09 14:00:22,863 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-09 14:00:22,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-09 14:00:22,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:22,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-09 14:00:22,942 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-09 14:00:22,943 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-09 14:00:22,943 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-09 14:00:22,943 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:00:22,943 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:00:22,949 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-09 14:00:22,956 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-09 14:00:23,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:23,211 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-09 14:00:23,217 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-09 14:00:23,222 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-01-09 14:00:23,226 [ scc.config] DEBUG Found github.token
2025-01-09 14:00:23,226 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-09 14:00:23,226 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:23,262 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:23,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:23,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:23,302 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:23,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f670038bb20> has no local changes
2025-01-09 14:00:23,308 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:23,316 [ scc.git] DEBUG [detached HEAD 1c93789] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:23,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:23,316 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:23,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-09 14:00:24,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-09 14:00:24,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-09 14:00:25,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-09 14:00:25,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-09 14:00:26,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-09 14:00:26,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-09 14:00:27,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-09 14:00:27,280 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:27,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-09 14:00:27,280 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:27,290 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:27,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:27,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:27,300 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:27,300 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:27,301 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,305 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:27,342 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:27,382 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:27,389 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f670032e880> has no local changes
2025-01-09 14:00:27,389 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:27,397 [ scc.git] DEBUG [detached HEAD 825adc8] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:27,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:27,398 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:27,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-09 14:00:27,693 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:27,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-09 14:00:27,693 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:27,702 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:27,702 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:27,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:27,712 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:27,712 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:27,712 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,716 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:27,752 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:27,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:27,757 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:27,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:27,799 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f670032e6a0> has no local changes
2025-01-09 14:00:27,799 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:27,807 [ scc.git] DEBUG [detached HEAD 6caa6df] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:27,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:27,807 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:28,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-09 14:00:28,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-09 14:00:29,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-09 14:00:30,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-09 14:00:31,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:31,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-09 14:00:32,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:32,317 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-09 14:00:32,317 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:32,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-09 14:00:32,317 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:32,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:32,322 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:32,327 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:32,327 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:32,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:32,337 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:32,338 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-09 14:00:33,308 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-09 14:00:33,308 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-09 14:00:33,311 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:33,311 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:33,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:33,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-09 14:00:33,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:33,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-09 14:00:33,335 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-09 14:00:33,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:33,338 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-09 14:00:33,338 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-09 14:00:33,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:33,495 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:33,531 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:33,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:33,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:33,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:33,576 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002e85b0> has no local changes
2025-01-09 14:00:33,576 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:33,584 [ scc.git] DEBUG [detached HEAD 29d4101] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:33,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:33,584 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:33,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-09 14:00:34,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-09 14:00:34,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-09 14:00:35,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-09 14:00:35,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:36,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-09 14:00:36,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:36,945 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-09 14:00:36,945 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:36,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-09 14:00:36,946 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:36,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:36,951 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:36,955 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:36,956 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:36,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:36,966 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:36,966 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-09 14:00:37,346 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-09 14:00:37,346 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-09 14:00:37,349 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:37,349 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:37,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:37,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-09 14:00:37,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:37,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-09 14:00:37,421 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG Auto-merging setup.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-09 14:00:37,422 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:00:37,422 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:00:37,427 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-09 14:00:37,432 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-09 14:00:37,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:37,608 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-09 14:00:37,613 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-09 14:00:37,635 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-01-09 14:00:37,639 [ scc.config] DEBUG Found github.token
2025-01-09 14:00:37,639 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-09 14:00:37,639 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:37,678 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:37,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:37,682 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:37,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:37,724 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002e87f0> has no local changes
2025-01-09 14:00:37,724 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:37,731 [ scc.git] DEBUG [detached HEAD 8a932c0] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:37,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:37,732 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:38,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-09 14:00:38,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-09 14:00:39,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-09 14:00:39,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-09 14:00:40,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:40,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 14:00:41,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-09 14:00:41,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-09 14:00:42,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-09 14:00:42,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-09 14:00:43,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-09 14:00:43,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:44,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-09 14:00:44,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:44,514 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-09 14:00:44,514 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:44,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-09 14:00:44,514 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:44,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:44,520 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:44,524 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:44,524 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:44,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:44,534 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:44,534 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-09 14:00:44,963 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-09 14:00:44,964 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-09 14:00:44,967 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:44,968 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:44,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:44,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-09 14:00:44,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:44,983 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-01-09 14:00:45,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-09 14:00:45,029 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-09 14:00:45,031 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-09 14:00:45,032 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-09 14:00:45,032 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-09 14:00:45,032 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-09 14:00:45,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:45,174 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:45,210 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:45,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:45,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:45,250 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:45,256 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002e8610> has no local changes
2025-01-09 14:00:45,256 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:45,264 [ scc.git] DEBUG [detached HEAD d6c474f] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:45,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:45,264 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:45,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-09 14:00:45,650 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:45,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-09 14:00:45,650 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:45,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:45,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:45,659 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:45,660 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:45,664 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:45,669 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:45,669 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:45,670 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:45,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:45,674 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:45,710 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:45,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:45,714 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:45,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:45,755 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6700355550> has no local changes
2025-01-09 14:00:45,755 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:45,762 [ scc.git] DEBUG [detached HEAD 9a5793c] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:45,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:45,763 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:46,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-09 14:00:46,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-09 14:00:47,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-09 14:00:47,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-09 14:00:48,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:48,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 14:00:49,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-09 14:00:49,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:49,643 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-09 14:00:49,643 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:49,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-09 14:00:49,643 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:49,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:49,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:49,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:49,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:49,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:49,663 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:49,663 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-09 14:00:50,098 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-09 14:00:50,098 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-09 14:00:50,101 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:50,101 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:50,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:50,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-09 14:00:50,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:50,115 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-09 14:00:50,138 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:00:50,141 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-09 14:00:50,141 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-09 14:00:50,141 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-09 14:00:50,141 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-09 14:00:50,141 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-09 14:00:50,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:50,295 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:50,334 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:50,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:50,340 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:50,377 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:50,383 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6700355790> has no local changes
2025-01-09 14:00:50,383 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:50,391 [ scc.git] DEBUG [detached HEAD 1974a1b] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:50,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:50,391 [ scc.git] INFO Overriding base-branch from master to main
2025-01-09 14:00:50,391 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:50,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-09 14:00:51,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-09 14:00:51,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-09 14:00:52,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-09 14:00:52,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:53,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 14:00:53,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-09 14:00:54,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-09 14:00:54,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-09 14:00:55,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-09 14:00:55,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:00:56,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-09 14:00:56,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:00:56,574 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-09 14:00:56,574 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:56,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-09 14:00:56,574 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:56,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:56,579 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-09 14:00:56,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:56,584 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-09 14:00:56,589 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-09 14:00:56,594 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:56,594 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-09 14:00:57,014 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-09 14:00:57,014 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-09 14:00:57,018 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:57,018 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:57,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-09 14:00:57,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-09 14:00:57,180 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-09 14:00:57,180 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-09 14:00:57,180 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:00:57,180 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:00:57,185 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-09 14:00:57,190 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-09 14:00:57,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:00:57,405 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-09 14:00:57,410 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-09 14:00:57,415 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-09 14:00:57,419 [ scc.config] DEBUG Found github.token
2025-01-09 14:00:57,420 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-09 14:00:57,420 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:57,456 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:57,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:57,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:57,502 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002c0580> has no local changes
2025-01-09 14:00:57,502 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:57,510 [ scc.git] DEBUG [detached HEAD d334a61] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:57,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:57,511 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:57,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-09 14:00:57,836 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:57,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-09 14:00:57,836 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:57,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:57,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:57,845 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:57,850 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:57,855 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:57,855 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:57,855 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:57,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,860 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:57,896 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:57,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:57,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:57,937 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:57,943 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002c04f0> has no local changes
2025-01-09 14:00:57,943 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:57,950 [ scc.git] DEBUG [detached HEAD 95f51af] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:57,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:57,951 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:58,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-09 14:00:58,250 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:00:58,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-09 14:00:58,250 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:58,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:58,255 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:00:58,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:00:58,260 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:00:58,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:00:58,270 [ scc.git] DEBUG Already up to date.
2025-01-09 14:00:58,270 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:00:58,270 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:58,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:58,274 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:00:58,310 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:00:58,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:00:58,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:00:58,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:00:58,356 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67002d1bb0> has no local changes
2025-01-09 14:00:58,356 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:00:58,364 [ scc.git] DEBUG [detached HEAD 3ec769d] merge master -Dorg -Ssuccess-only
2025-01-09 14:00:58,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:00:58,364 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:00:58,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-09 14:00:59,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-09 14:00:59,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-09 14:01:00,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-09 14:01:00,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:01:01,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-09 14:01:01,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:01:01,706 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-09 14:01:01,706 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:01:01,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-09 14:01:01,706 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:01,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:01,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-09 14:01:01,716 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:01:01,716 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-09 14:01:01,721 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-09 14:01:01,726 [ scc.git] DEBUG Already up to date.
2025-01-09 14:01:01,726 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-09 14:01:02,392 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-09 14:01:02,392 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-09 14:01:02,396 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:01:02,396 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:02,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:02,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-09 14:01:02,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:02,410 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-09 14:01:02,450 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-09 14:01:02,450 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-09 14:01:02,450 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:01:02,450 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:01:02,455 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-09 14:01:02,462 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-09 14:01:02,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:02,668 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-09 14:01:02,672 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-09 14:01:02,677 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-09 14:01:02,681 [ scc.config] DEBUG Found github.token
2025-01-09 14:01:02,681 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-09 14:01:02,682 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:01:02,717 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:02,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:02,721 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:01:02,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:01:02,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6700277a30> has no local changes
2025-01-09 14:01:02,762 [ 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#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:01:02,770 [ scc.git] DEBUG [detached HEAD 7bfb5cf] merge master -Dorg -Ssuccess-only
2025-01-09 14:01:02,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:02,770 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-09 14:01:02,771 [ scc.repo] DEBUG ## PRs found:
2025-01-09 14:01:03,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-09 14:01:03,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-09 14:01:04,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-09 14:01:04,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-09 14:01:05,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:01:05,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-09 14:01:06,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-09 14:01:06,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:01:06,760 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-09 14:01:07,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-09 14:01:07,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-09 14:01:08,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-09 14:01:08,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-09 14:01:09,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-09 14:01:09,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-09 14:01:09,586 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-09 14:01:10,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-09 14:01:10,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-09 14:01:11,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-09 14:01:11,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-09 14:01:11,606 [ scc.repo] DEBUG ## Branches found:
2025-01-09 14:01:11,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-09 14:01:11,606 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:11,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:11,611 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-09 14:01:11,616 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-09 14:01:11,616 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-09 14:01:11,621 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-09 14:01:11,626 [ scc.git] DEBUG Already up to date.
2025-01-09 14:01:11,626 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-09 14:01:12,508 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-09 14:01:12,508 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-09 14:01:12,512 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-09 14:01:12,977 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-09 14:01:12,977 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-09 14:01:12,980 [ scc.git] DEBUG ## Unique users: []
2025-01-09 14:01:12,980 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:12,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:12,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-09 14:01:12,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:12,996 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-09 14:01:13,052 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-09 14:01:13,053 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-09 14:01:13,053 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-09 14:01:13,058 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-09 14:01:13,063 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-09 14:01:13,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:13,212 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-09 14:01:13,219 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-09 14:01:13,224 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#301](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-09 14:01:13,229 [ scc.config] DEBUG Found github.token
2025-01-09 14:01:13,229 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-09 14:01:13,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-09 14:01:13,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:13,240 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-09 14:01:13,260 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-09 14:01:13,262 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-09 14:01:13,262 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-09 14:01:13,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:13,606 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-09 14:01:13,642 [ scc.git] DEBUG Get sha1 of %s
2025-01-09 14:01:13,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-09 14:01:13,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:01:13,682 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:01:13,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6700277670> has no local changes
2025-01-09 14:01:13,688 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:01:13,695 [ scc.git] DEBUG [detached HEAD 3c7a673] merge master -Dorg -Ssuccess-only
2025-01-09 14:01:13,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:13,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-09 14:01:13,765 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-09 14:01:14,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:14,019 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-09 14:01:14,024 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-09 14:01:14,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:14,406 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-09 14:01:14,410 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-09 14:01:14,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:14,798 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-09 14:01:14,802 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-09 14:01:15,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:15,228 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-09 14:01:15,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:15,604 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-09 14:01:15,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-09 14:01:15,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:16,004 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-09 14:01:16,008 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-09 14:01:16,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:16,401 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-09 14:01:16,405 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-09 14:01:16,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:16,802 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-09 14:01:16,806 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-09 14:01:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:17,197 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-09 14:01:17,201 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-09 14:01:17,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:17,594 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-09 14:01:17,598 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-09 14:01:17,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:17,981 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-09 14:01:17,985 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-09 14:01:18,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:18,377 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-09 14:01:18,381 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-09 14:01:18,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:18,769 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-09 14:01:19,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:19,164 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-09 14:01:19,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:19,559 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-09 14:01:19,563 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-09 14:01:19,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:19,955 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-09 14:01:20,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:20,355 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-09 14:01:20,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:20,738 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-09 14:01:20,742 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-09 14:01:21,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:21,124 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-09 14:01:21,128 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-09 14:01:21,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:21,520 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-09 14:01:21,524 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-09 14:01:21,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:21,928 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-09 14:01:21,932 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-09 14:01:22,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-09 14:01:22,316 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-09 14:01:22,317 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-09 14:01:22,392 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67034c6370> has local changes
2025-01-09 14:01:22,392 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 607 Rdornier 'fix NoneType exception on timeincrement'
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'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#301 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/301/)'
2025-01-09 14:01:22,405 [ scc.git] DEBUG [detached HEAD 7f9b094] merge master -Dorg -Ssuccess-only
2025-01-09 14:01:22,405 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-09 14:01:22,405 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-09 14:01:22,405 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,405 [ scc.merge] INFO
2025-01-09 14:01:22,405 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,405 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-09 14:01:22,405 [ scc.merge] INFO
2025-01-09 14:01:22,405 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-09 14:01:22,405 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,405 [ scc.merge] INFO
2025-01-09 14:01:22,405 [ scc.merge] INFO
2025-01-09 14:01:22,405 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-09 14:01:22,405 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,405 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-09 14:01:22,406 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-09 14:01:22,406 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-09 14:01:22,406 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-09 14:01:22,406 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-09 14:01:22,406 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-09 14:01:22,406 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-09 14:01:22,406 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,406 [ scc.merge] INFO - PR 607 Rdornier 'fix NoneType exception on timeincrement'
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-09 14:01:22,406 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,406 [ scc.merge] INFO
2025-01-09 14:01:22,406 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-09 14:01:22,407 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-09 14:01:22,407 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-09 14:01:22,407 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-09 14:01:22,407 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-09 14:01:22,407 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,407 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-09 14:01:22,407 [ scc.merge] INFO
2025-01-09 14:01:22,407 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-09 14:01:22,408 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-09 14:01:22,408 [ scc.merge] INFO
2025-01-09 14:01:22,408 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-09 14:01:22,408 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-09 14:01:22,408 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-09 14:01:22,408 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-09 14:01:22,409 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-09 14:01:22,409 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,409 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,409 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-09 14:01:22,409 [ scc.merge] INFO
2025-01-09 14:01:22,410 [ scc.merge] INFO Repository: ome/scripts
2025-01-09 14:01:22,410 [ scc.merge] INFO Excluded PRs:
2025-01-09 14:01:22,410 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-09 14:01:22,410 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-09 14:01:22,410 [ scc.merge] INFO Already up to date.
2025-01-09 14:01:22,410 [ scc.merge] INFO
2025-01-09 14:01:22,410 [ scc.merge] INFO Merged PRs:
2025-01-09 14:01:22,410 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-09 14:01:22,410 [ scc.merge] INFO
2025-01-09 14:01:22,410 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-09 14:01:22,410 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-09 14:01:22,410 [ scc.merge] INFO
2025-01-09 14:01:22,410 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-09 14:01:22,410 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-09 14:01:22,414 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-09 14:01:22,419 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-09 14:01:22,424 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-09 14:01:22,428 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-09 14:01:22,433 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-09 14:01:22,438 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-09 14:01:22,442 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-09 14:01:22,447 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-09 14:01:22,451 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-09 14:01:22,456 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-09 14:01:22,461 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-09 14:01:22,465 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-09 14:01:22,470 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-09 14:01:22,474 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-09 14:01:22,479 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-09 14:01:22,484 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-09 14:01:22,488 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-09 14:01:22,493 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-09 14:01:22,498 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-09 14:01:22,502 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-09 14:01:22,507 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-09 14:01:22,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-09 14:01:22,511 [ scc.git] DEBUG Calling 'git remote'
2025-01-09 14:01:22,516 [ 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 50f1d65] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD b8bcdb8] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-09 14:02:08,316 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-01-09 14:02:17,392 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-01-09 14:02:19,770 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-09 14:02:24,295 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-09 14:03:10,613 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/695419c3/images/svgs/logo.svg){kind=logo}
