Console Output
Skipping 82 KB..
Full Logill-moore 'Plate well labels' (exclude comment)
Updating fb316a7e..a80640a9
Previously merged:
- PR 607 Rdornier 'fix NoneType exception on timeincrement'
Generated by OMERO-plugins-push#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:36:05,342 [ scc.git] DEBUG [detached HEAD 33e833d8] merge master -Dorg -Ssuccess-only
2025-01-10 01:36:05,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:36:05,343 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:36:05,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-10 01:36:06,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-10 01:36:06,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-10 01:36:07,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-10 01:36:07,631 [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-10 01:36:08,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-10 01:36:08,472 [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-10 01:36:08,473 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-10 01:36:08,473 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:36:08,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-10 01:36:08,474 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:08,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:08,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:36:08,485 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:36:08,486 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:36:08,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:36:08,499 [ scc.git] DEBUG Already up to date.
2025-01-10 01:36:08,499 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-10 01:36:08,824 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-10 01:36:08,824 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-10 01:36:08,829 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:36:08,829 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:08,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:08,834 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-10 01:36:08,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:08,845 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-10 01:36:08,854 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-10 01:36:08,855 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:08,857 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-10 01:36:08,857 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-10 01:36:09,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:09,074 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:36:09,114 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:09,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:09,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:36:09,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:36:09,169 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750d911e20> has no local changes
2025-01-10 01:36:09,169 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:36:09,177 [ scc.git] DEBUG [detached HEAD d8b2523] merge master -Dorg -Ssuccess-only
2025-01-10 01:36:09,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:36:09,178 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:36:09,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-10 01:36:10,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-10 01:36:10,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-10 01:36:11,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-10 01:36:11,321 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:11,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-10 01:36:12,548 [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-10 01:36:13,039 [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-10 01:36:13,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-10 01:36:14,053 [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-10 01:36:14,054 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-10 01:36:14,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-10 01:36:14,516 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:15,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-10 01:36:15,664 [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-10 01:36:16,178 [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-10 01:36:16,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-10 01:36:17,088 [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-10 01:36:17,088 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-10 01:36:17,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-10 01:36:17,577 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:18,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-10 01:36:18,618 [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-10 01:36:19,119 [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-10 01:36:19,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-10 01:36:20,077 [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-10 01:36:20,078 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-10 01:36:20,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-10 01:36:21,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-10 01:36:21,021 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:21,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-10 01:36:22,095 [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-10 01:36:22,567 [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-10 01:36:23,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-10 01:36:23,441 [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-10 01:36:23,442 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-10 01:36:23,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-10 01:36:23,900 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:24,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-10 01:36:24,955 [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-10 01:36:25,450 [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-10 01:36:25,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-10 01:36:26,439 [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-10 01:36:26,440 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-10 01:36:26,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-10 01:36:26,901 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:27,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-10 01:36:27,936 [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-10 01:36:28,434 [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-10 01:36:28,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-10 01:36:29,364 [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-10 01:36:29,365 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-10 01:36:29,365 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:36:29,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-10 01:36:29,366 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:29,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:29,371 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:36:29,377 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:36:29,377 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:36:29,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:36:29,388 [ scc.git] DEBUG Already up to date.
2025-01-10 01:36:29,388 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-10 01:36:29,727 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:29,727 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-10 01:36:29,733 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-10 01:36:30,051 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:30,051 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-10 01:36:30,056 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-10 01:36:30,345 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:30,345 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-10 01:36:30,350 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-10 01:36:30,637 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:30,637 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-10 01:36:30,642 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-10 01:36:30,932 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:30,932 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-10 01:36:30,936 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-10 01:36:31,216 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-10 01:36:31,217 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-10 01:36:31,221 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:36:31,221 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:31,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:31,227 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-10 01:36:31,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:31,236 [ 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-10 01:36:31,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:31,251 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-10 01:36:31,252 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-10 01:36:31,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:31,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-10 01:36:31,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:31,421 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-10 01:36:31,440 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-10 01:36:31,440 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:31,446 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-10 01:36:31,446 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-10 01:36:31,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:31,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-10 01:36:31,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:31,822 [ 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-10 01:36:31,840 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-10 01:36:31,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-10 01:36:31,840 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:36:31,840 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:36:31,846 [ scc.git] DEBUG Calling 'git reset --hard 2fa2ea2f92851a02da814988df9abd6dc85dfeeb'
2025-01-10 01:36:31,853 [ scc.git] DEBUG HEAD is now at 2fa2ea2 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-10 01:36:32,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:32,191 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-10 01:36:32,197 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-10 01:36:32,202 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/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-10 01:36:32,207 [ scc.config] DEBUG Found github.token
2025-01-10 01:36:32,207 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-10 01:36:32,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-10 01:36:32,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:32,217 [ 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-10 01:36:32,235 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-10 01:36:32,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:32,240 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-10 01:36:32,240 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-10 01:36:32,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:32,628 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-10 01:36:32,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:32,640 [ 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-10 01:36:32,659 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-10 01:36:32,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:32,664 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-10 01:36:32,664 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-10 01:36:33,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:33,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-10 01:36:33,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:33,045 [ 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-10 01:36:33,064 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-10 01:36:33,064 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-10 01:36:33,064 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:36:33,064 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:36:33,070 [ scc.git] DEBUG Calling 'git reset --hard 4a92021b74632f54262f7209bd04ef24de3b278f'
2025-01-10 01:36:33,078 [ scc.git] DEBUG HEAD is now at 4a92021 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-10 01:36:33,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:33,427 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-10 01:36:33,433 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-10 01:36:33,439 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/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-10 01:36:33,443 [ scc.config] DEBUG Found github.token
2025-01-10 01:36:33,444 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-10 01:36:33,444 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:36:33,483 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:33,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:33,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:36:33,530 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:36:33,538 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750d904b20> has no local changes
2025-01-10 01:36:33,538 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:36:33,549 [ scc.git] DEBUG [detached HEAD a2ca16a] merge master -Dorg -Ssuccess-only
2025-01-10 01:36:33,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:36:33,549 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:36:33,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-10 01:36:34,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-10 01:36:35,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-10 01:36:35,465 [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-10 01:36:35,957 [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-10 01:36:36,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-10 01:36:36,827 [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-10 01:36:36,828 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-10 01:36:37,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-10 01:36:37,319 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-10 01:36:37,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-10 01:36:38,368 [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-10 01:36:38,864 [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-10 01:36:39,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-10 01:36:39,744 [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-10 01:36:39,745 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-10 01:36:40,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-10 01:36:40,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-10 01:36:41,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-10 01:36:41,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-10 01:36:42,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-10 01:36:42,660 [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-10 01:36:43,091 [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-10 01:36:43,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-10 01:36:44,078 [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-10 01:36:44,079 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-10 01:36:44,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-10 01:36:45,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-10 01:36:45,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-10 01:36:46,187 [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-10 01:36:46,630 [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-10 01:36:47,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-10 01:36:47,604 [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-10 01:36:47,605 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-10 01:36:48,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-10 01:36:48,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-10 01:36:49,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-10 01:36:49,491 [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-10 01:36:49,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-10 01:36:50,390 [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-10 01:36:50,391 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-10 01:36:50,392 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:36:50,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-10 01:36:50,392 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:50,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:50,399 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:36:50,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:36:50,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:36:50,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:36:50,414 [ scc.git] DEBUG Already up to date.
2025-01-10 01:36:50,414 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-10 01:36:50,777 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-10 01:36:50,777 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-10 01:36:50,782 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-10 01:36:51,070 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-10 01:36:51,071 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-10 01:36:51,076 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-10 01:36:51,444 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-10 01:36:51,445 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-10 01:36:51,449 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-10 01:36:51,744 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-10 01:36:51,745 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-10 01:36:51,750 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-10 01:36:52,039 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-10 01:36:52,039 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-10 01:36:52,043 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:36:52,043 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:52,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:52,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-10 01:36:52,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:52,060 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-10 01:36:52,073 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-10 01:36:52,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:52,077 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-10 01:36:52,077 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-10 01:36:52,077 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-10 01:36:52,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:52,212 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-10 01:36:52,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:52,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-10 01:36:52,245 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-10 01:36:52,246 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-10 01:36:52,246 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-10 01:36:52,246 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-10 01:36:52,246 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:52,250 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-10 01:36:52,250 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-10 01:36:52,250 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-10 01:36:52,250 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-10 01:36:52,250 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-10 01:36:52,250 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-10 01:36:52,250 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-10 01:36:52,250 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-10 01:36:52,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:52,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-10 01:36:52,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:52,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-10 01:36:52,635 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-10 01:36:52,636 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:52,639 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-10 01:36:52,639 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-10 01:36:52,639 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-10 01:36:52,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:52,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-10 01:36:53,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:53,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-10 01:36:53,028 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:53,038 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-10 01:36:53,038 [ scc.git] DEBUG package.json | 2 +-
2025-01-10 01:36:53,038 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-10 01:36:53,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:53,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-10 01:36:53,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:53,398 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-10 01:36:53,422 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-10 01:36:53,422 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-10 01:36:53,422 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-10 01:36:53,422 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-10 01:36:53,422 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-10 01:36:53,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:53,427 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-10 01:36:53,427 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-10 01:36:53,427 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-10 01:36:53,427 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-10 01:36:53,427 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-10 01:36:53,427 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-10 01:36:53,427 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-10 01:36:53,427 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-10 01:36:53,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:53,798 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:36:53,838 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:53,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:53,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:36:53,881 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:36:53,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750d8fae80> has no local changes
2025-01-10 01:36:53,892 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:36:53,904 [ scc.git] DEBUG [detached HEAD d00b455] merge master -Dorg -Ssuccess-only
2025-01-10 01:36:53,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:36:53,904 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:36:54,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-10 01:36:54,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-10 01:36:55,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-10 01:36:55,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-10 01:36:56,414 [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-10 01:36:56,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-10 01:36:57,367 [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-10 01:36:57,368 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-10 01:36:57,368 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:36:57,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-10 01:36:57,368 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:57,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:57,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:36:57,380 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:36:57,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:36:57,386 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:36:57,391 [ scc.git] DEBUG Already up to date.
2025-01-10 01:36:57,392 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-10 01:36:57,715 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-10 01:36:57,715 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-10 01:36:57,720 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:36:57,720 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:57,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:57,726 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-10 01:36:57,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:57,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-10 01:36:57,752 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:36:57,755 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-10 01:36:57,755 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-10 01:36:57,755 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-10 01:36:57,755 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-10 01:36:57,755 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-10 01:36:57,755 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-10 01:36:57,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:36:57,905 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:36:57,949 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:36:57,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:36:57,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:36:57,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:36:58,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c0975b0> has no local changes
2025-01-10 01:36:58,001 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:36:58,009 [ scc.git] DEBUG [detached HEAD b40cf07] merge master -Dorg -Ssuccess-only
2025-01-10 01:36:58,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:36:58,010 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:36:58,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-10 01:36:58,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-10 01:36:59,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-10 01:37:00,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-10 01:37:00,810 [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-10 01:37:01,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-10 01:37:01,703 [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-10 01:37:01,704 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-10 01:37:02,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-10 01:37:02,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-10 01:37:03,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-10 01:37:03,690 [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-10 01:37:04,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-10 01:37:04,545 [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-10 01:37:04,545 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-10 01:37:04,545 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:04,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-10 01:37:04,546 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:04,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:04,552 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:04,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:04,560 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:04,568 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:04,574 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:04,574 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-10 01:37:04,886 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-10 01:37:04,886 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-10 01:37:04,892 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-10 01:37:05,200 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-10 01:37:05,200 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-10 01:37:05,207 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:05,207 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:05,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:05,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-10 01:37:05,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:05,226 [ 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-10 01:37:05,241 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-10 01:37:05,241 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-10 01:37:05,241 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-10 01:37:05,242 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-10 01:37:05,242 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:05,243 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:05,249 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-10 01:37:05,256 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-10 01:37:05,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:05,405 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-10 01:37:05,413 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-10 01:37:05,420 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-10 01:37:05,425 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:05,426 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-10 01:37:05,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-10 01:37:05,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:05,439 [ 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-10 01:37:05,457 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-10 01:37:05,458 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-10 01:37:05,458 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-10 01:37:05,458 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:05,458 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:05,465 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-10 01:37:05,474 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-10 01:37:05,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:05,813 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-10 01:37:05,822 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-10 01:37:05,831 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/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-10 01:37:05,836 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:05,837 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-10 01:37:05,837 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:05,880 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:05,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:05,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:05,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:05,939 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c0aab80> has no local changes
2025-01-10 01:37:05,939 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:05,950 [ scc.git] DEBUG [detached HEAD c5d55e3] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:05,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:05,950 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:06,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-10 01:37:06,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-10 01:37:07,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-10 01:37:07,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-10 01:37:08,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-10 01:37:08,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-10 01:37:09,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-10 01:37:09,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-10 01:37:09,726 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:09,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-10 01:37:09,726 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:09,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:09,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:09,739 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:09,739 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:09,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:09,753 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:09,753 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:09,753 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:09,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:09,759 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:09,802 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:09,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:09,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:09,849 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:09,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c09cf40> has no local changes
2025-01-10 01:37:09,856 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:09,864 [ scc.git] DEBUG [detached HEAD b1fa721] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:09,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:09,864 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:10,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-10 01:37:10,177 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:10,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-10 01:37:10,177 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:10,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:10,183 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:10,188 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:10,188 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:10,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:10,198 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:10,199 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:10,199 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:10,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:10,203 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:10,243 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:10,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:10,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:10,295 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:10,302 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c04e940> has no local changes
2025-01-10 01:37:10,302 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:10,311 [ scc.git] DEBUG [detached HEAD 9182525] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:10,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:10,312 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:10,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-10 01:37:11,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-10 01:37:11,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-10 01:37:12,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-10 01:37:12,632 [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-10 01:37:13,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-10 01:37:13,583 [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-10 01:37:13,584 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-10 01:37:13,584 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:13,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-10 01:37:13,584 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:13,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:13,590 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:13,596 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:13,596 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:13,603 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:13,609 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:13,609 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-10 01:37:13,910 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-10 01:37:13,910 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-10 01:37:13,916 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:13,916 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:13,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:13,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-10 01:37:13,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:13,937 [ 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-10 01:37:13,948 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-10 01:37:13,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:37:13,951 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-10 01:37:13,952 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-10 01:37:14,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:14,124 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:14,170 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:14,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:14,177 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:14,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:14,225 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47c95e0> has no local changes
2025-01-10 01:37:14,226 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:14,236 [ scc.git] DEBUG [detached HEAD 3bdd6de] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:14,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:14,236 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:14,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-10 01:37:15,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-10 01:37:15,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-10 01:37:16,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-10 01:37:16,527 [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-10 01:37:16,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-10 01:37:17,377 [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-10 01:37:17,378 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-10 01:37:17,378 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:17,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-10 01:37:17,378 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:17,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:17,385 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:17,391 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:17,391 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:17,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:17,402 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:17,403 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-10 01:37:17,710 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-10 01:37:17,711 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-10 01:37:17,715 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:17,715 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:17,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:17,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-10 01:37:17,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:17,731 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-10 01:37:17,742 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG Auto-merging setup.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-10 01:37:17,742 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:17,742 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:17,748 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-10 01:37:17,755 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-10 01:37:17,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:17,916 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-10 01:37:17,923 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-10 01:37:17,930 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-01-10 01:37:17,936 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:17,936 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-10 01:37:17,936 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:17,974 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:17,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:17,979 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:18,017 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:18,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47c97f0> has no local changes
2025-01-10 01:37:18,024 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:18,031 [ scc.git] DEBUG [detached HEAD 7ff7fba] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:18,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:18,032 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:18,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-10 01:37:18,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-10 01:37:19,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-10 01:37:19,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-10 01:37:20,385 [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-10 01:37:20,858 [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-10 01:37:21,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-10 01:37:21,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-10 01:37:22,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-10 01:37:22,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-10 01:37:23,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-10 01:37:23,653 [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-10 01:37:24,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-10 01:37:24,485 [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-10 01:37:24,485 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-10 01:37:24,486 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:24,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-10 01:37:24,486 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:24,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:24,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:24,497 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:24,497 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:24,503 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:24,508 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:24,508 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-10 01:37:24,811 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-10 01:37:24,811 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-10 01:37:24,816 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:24,816 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:24,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:24,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-10 01:37:24,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:24,833 [ 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-10 01:37:24,846 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:37:24,848 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-10 01:37:24,848 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-10 01:37:24,848 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-10 01:37:24,848 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-10 01:37:24,848 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-10 01:37:24,849 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-10 01:37:24,849 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-10 01:37:24,851 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-10 01:37:24,851 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-10 01:37:24,851 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-10 01:37:24,852 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-10 01:37:24,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:24,998 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:25,046 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:25,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:25,053 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:25,094 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:25,102 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47c9640> has no local changes
2025-01-10 01:37:25,102 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:25,111 [ scc.git] DEBUG [detached HEAD 48caec3] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:25,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:25,111 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:25,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-10 01:37:25,406 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:25,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-10 01:37:25,406 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:25,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:25,413 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:25,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:25,419 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:25,425 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:25,431 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:25,432 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:25,432 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:25,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:25,437 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:25,476 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:25,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:25,483 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:25,522 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:25,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c069550> has no local changes
2025-01-10 01:37:25,529 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:25,536 [ scc.git] DEBUG [detached HEAD 35b261a] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:25,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:25,537 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:25,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-10 01:37:26,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-10 01:37:26,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-10 01:37:27,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-10 01:37:27,889 [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-10 01:37:28,345 [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-10 01:37:28,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-10 01:37:29,169 [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-10 01:37:29,170 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-10 01:37:29,170 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:29,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-10 01:37:29,170 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:29,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:29,177 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:29,182 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:29,183 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:29,188 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:29,195 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:29,195 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-10 01:37:29,494 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-10 01:37:29,494 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-10 01:37:29,500 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:29,500 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:29,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:29,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-10 01:37:29,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:29,517 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-10 01:37:29,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:37:29,530 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-10 01:37:29,530 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-10 01:37:29,530 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-10 01:37:29,530 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-10 01:37:29,530 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-10 01:37:29,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:29,674 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:29,719 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:29,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:29,725 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:29,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:29,778 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750c069790> has no local changes
2025-01-10 01:37:29,778 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:29,787 [ scc.git] DEBUG [detached HEAD 2e202f8] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:29,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:29,788 [ scc.git] INFO Overriding base-branch from master to main
2025-01-10 01:37:29,788 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:30,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-10 01:37:30,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-10 01:37:31,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-10 01:37:31,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-10 01:37:32,093 [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-10 01:37:32,594 [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-10 01:37:33,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-10 01:37:33,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-10 01:37:34,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-10 01:37:34,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-10 01:37:34,970 [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-10 01:37:35,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-10 01:37:35,805 [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-10 01:37:35,806 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-10 01:37:35,806 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:35,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-10 01:37:35,806 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:35,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:35,813 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-10 01:37:35,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:35,818 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-10 01:37:35,824 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-10 01:37:35,830 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:35,831 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-10 01:37:36,152 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-10 01:37:36,152 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-10 01:37:36,157 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:36,158 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:36,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-10 01:37:36,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-10 01:37:36,182 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-10 01:37:36,183 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-10 01:37:36,183 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:36,183 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:36,189 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-10 01:37:36,195 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-10 01:37:36,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:36,350 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-10 01:37:36,356 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-10 01:37:36,361 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-10 01:37:36,366 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:36,366 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-10 01:37:36,366 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:36,416 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:36,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:36,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:36,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47a1580> has no local changes
2025-01-10 01:37:36,467 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:36,476 [ scc.git] DEBUG [detached HEAD 9c8ee3b] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:36,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:36,476 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:36,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-10 01:37:36,773 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:36,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-10 01:37:36,773 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:36,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:36,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:36,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:36,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:36,794 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:36,794 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:36,795 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:36,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,799 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:36,838 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:36,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:36,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:36,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:36,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47a14f0> has no local changes
2025-01-10 01:37:36,896 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:36,903 [ scc.git] DEBUG [detached HEAD f717f29] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:36,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:36,904 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:37,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-10 01:37:37,193 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:37,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-10 01:37:37,193 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:37,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:37,201 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:37,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:37,207 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:37,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:37,222 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:37,222 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:37,223 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:37,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:37,227 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:37,287 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:37,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:37,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:37,335 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:37,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f47b2bb0> has no local changes
2025-01-10 01:37:37,343 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:37,352 [ scc.git] DEBUG [detached HEAD 13ecdb2] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:37,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:37,353 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:37,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-10 01:37:38,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-10 01:37:38,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-10 01:37:39,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-10 01:37:39,658 [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-10 01:37:40,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-10 01:37:40,511 [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-10 01:37:40,511 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-10 01:37:40,511 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:40,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-10 01:37:40,512 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:40,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:40,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-10 01:37:40,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:40,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-10 01:37:40,528 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-10 01:37:40,532 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:40,533 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-10 01:37:40,947 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-10 01:37:40,947 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-10 01:37:40,951 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:40,952 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:40,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:40,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-10 01:37:40,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:40,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-10 01:37:40,978 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-10 01:37:40,978 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-10 01:37:40,978 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:40,978 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:40,984 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-10 01:37:40,991 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-10 01:37:41,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:41,132 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-10 01:37:41,138 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-10 01:37:41,143 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-10 01:37:41,148 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:41,148 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-10 01:37:41,148 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:41,185 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:41,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:41,191 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:41,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:41,234 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f4758a30> has no local changes
2025-01-10 01:37:41,234 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:41,242 [ scc.git] DEBUG [detached HEAD 739fe43] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:41,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:41,243 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-10 01:37:41,243 [ scc.repo] DEBUG ## PRs found:
2025-01-10 01:37:41,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-10 01:37:42,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-10 01:37:42,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-10 01:37:43,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-10 01:37:43,649 [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-10 01:37:44,109 [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-10 01:37:44,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-10 01:37:44,958 [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-10 01:37:44,958 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-10 01:37:45,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-10 01:37:45,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-10 01:37:46,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-10 01:37:46,854 [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-10 01:37:47,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-10 01:37:47,722 [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-10 01:37:47,723 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-10 01:37:48,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-10 01:37:48,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-10 01:37:49,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-10 01:37:49,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-10 01:37:49,753 [ scc.repo] DEBUG ## Branches found:
2025-01-10 01:37:49,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-10 01:37:49,753 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:49,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:49,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-10 01:37:49,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-10 01:37:49,765 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-10 01:37:49,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-10 01:37:49,778 [ scc.git] DEBUG Already up to date.
2025-01-10 01:37:49,778 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-10 01:37:50,152 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-10 01:37:50,153 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-10 01:37:50,157 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-10 01:37:50,498 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-10 01:37:50,498 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-10 01:37:50,502 [ scc.git] DEBUG ## Unique users: []
2025-01-10 01:37:50,502 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:50,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:50,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-10 01:37:50,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:50,522 [ 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-10 01:37:50,534 [ 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-10 01:37:50,534 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-10 01:37:50,535 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-10 01:37:50,540 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-10 01:37:50,546 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-10 01:37:50,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:50,717 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-10 01:37:50,725 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-10 01:37:50,734 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#302](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-10 01:37:50,739 [ scc.config] DEBUG Found github.token
2025-01-10 01:37:50,739 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-10 01:37:50,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-10 01:37:50,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:50,750 [ 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-10 01:37:50,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-10 01:37:50,763 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-10 01:37:50,763 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-10 01:37:51,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:51,106 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-10 01:37:51,146 [ scc.git] DEBUG Get sha1 of %s
2025-01-10 01:37:51,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-10 01:37:51,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:51,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:51,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74f4758670> has no local changes
2025-01-10 01:37:51,198 [ 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:51,207 [ scc.git] DEBUG [detached HEAD 1f5324c] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:51,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:51,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-10 01:37:51,282 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-10 01:37:51,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:51,507 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-10 01:37:51,512 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-10 01:37:51,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:51,905 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-10 01:37:51,910 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-10 01:37:52,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:52,292 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-10 01:37:52,297 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-10 01:37:52,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:52,692 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-10 01:37:53,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:53,084 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-10 01:37:53,089 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-10 01:37:53,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:53,483 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-10 01:37:53,489 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-10 01:37:53,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:53,879 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-10 01:37:53,887 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-10 01:37:54,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:54,267 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-10 01:37:54,273 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-10 01:37:54,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:54,654 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-10 01:37:54,658 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-10 01:37:55,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:55,052 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-10 01:37:55,058 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-10 01:37:55,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:55,449 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-10 01:37:55,453 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-10 01:37:55,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:55,864 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-10 01:37:55,869 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-10 01:37:56,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:56,256 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-10 01:37:56,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:56,645 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-10 01:37:57,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:57,045 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-10 01:37:57,050 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-10 01:37:57,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:57,458 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-10 01:37:57,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:57,866 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-10 01:37:58,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:58,242 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-10 01:37:58,250 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-10 01:37:58,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:58,649 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-10 01:37:58,660 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-10 01:37:59,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:59,055 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-10 01:37:59,061 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-10 01:37:59,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:59,438 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-10 01:37:59,443 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-10 01:37:59,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-10 01:37:59,824 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-10 01:37:59,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-10 01:37:59,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f750e9e5370> has local changes
2025-01-10 01:37:59,914 [ 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)
Updating fb316a7e..a80640a9
Previously merged:
- 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#302 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/302/)'
2025-01-10 01:37:59,929 [ scc.git] DEBUG [detached HEAD e9ef71f] merge master -Dorg -Ssuccess-only
2025-01-10 01:37:59,929 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-10 01:37:59,929 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-10 01:37:59,929 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,929 [ scc.merge] INFO
2025-01-10 01:37:59,929 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-10 01:37:59,930 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-10 01:37:59,930 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-10 01:37:59,930 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-10 01:37:59,930 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-10 01:37:59,930 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-10 01:37:59,930 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-10 01:37:59,930 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-10 01:37:59,930 [ scc.merge] INFO
2025-01-10 01:37:59,930 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-10 01:37:59,930 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-10 01:37:59,930 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-10 01:37:59,931 [ scc.merge] INFO Updating fb316a7e..a80640a9
2025-01-10 01:37:59,931 [ scc.merge] INFO Previously merged:
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 607 Rdornier 'fix NoneType exception on timeincrement'
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-10 01:37:59,931 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-10 01:37:59,931 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-10 01:37:59,931 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-10 01:37:59,931 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-10 01:37:59,931 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-10 01:37:59,931 [ scc.merge] INFO
2025-01-10 01:37:59,931 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-10 01:37:59,932 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-10 01:37:59,932 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-10 01:37:59,932 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,932 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,932 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-10 01:37:59,932 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-10 01:37:59,933 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-10 01:37:59,933 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,933 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO
2025-01-10 01:37:59,933 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-10 01:37:59,933 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,934 [ scc.merge] INFO
2025-01-10 01:37:59,934 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,934 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-10 01:37:59,934 [ scc.merge] INFO
2025-01-10 01:37:59,934 [ scc.merge] INFO Repository: ome/scripts
2025-01-10 01:37:59,934 [ scc.merge] INFO Excluded PRs:
2025-01-10 01:37:59,934 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-10 01:37:59,934 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-10 01:37:59,934 [ scc.merge] INFO Already up to date.
2025-01-10 01:37:59,934 [ scc.merge] INFO
2025-01-10 01:37:59,934 [ scc.merge] INFO Merged PRs:
2025-01-10 01:37:59,934 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-10 01:37:59,934 [ scc.merge] INFO
2025-01-10 01:37:59,934 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-10 01:37:59,934 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-10 01:37:59,934 [ scc.merge] INFO
2025-01-10 01:37:59,934 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-10 01:37:59,934 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-10 01:37:59,940 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-10 01:37:59,946 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-10 01:37:59,952 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-10 01:37:59,957 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-10 01:37:59,963 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-10 01:37:59,968 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-10 01:37:59,973 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-10 01:37:59,978 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-10 01:37:59,983 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-10 01:37:59,989 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-10 01:37:59,993 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:37:59,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:37:59,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-10 01:37:59,998 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-10 01:38:00,004 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-10 01:38:00,008 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-10 01:38:00,013 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-10 01:38:00,018 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-10 01:38:00,023 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-10 01:38:00,028 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-10 01:38:00,034 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-10 01:38:00,039 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-10 01:38:00,044 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-10 01:38:00,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-10 01:38:00,049 [ scc.git] DEBUG Calling 'git remote'
2025-01-10 01:38:00,053 [ 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 d5021cd] 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 2141417] 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-10 01:38:45,347 [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-10 01:38:54,451 [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-10 01:38:56,769 [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-10 01:39:01,214 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-10 01:39:40,525 [ 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}
