Console Output
Skipping 94 KB..
Full LogDEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2024-12-18 00:46:52,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2024-12-18 00:46:52,166 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:46:52,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-18 00:46:52,167 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:52,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:52,172 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:46:52,176 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:46:52,176 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:46:52,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:46:52,187 [ scc.git] DEBUG Already up to date.
2024-12-18 00:46:52,187 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:46:52,187 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:52,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:52,191 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:46:52,227 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:52,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:52,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:46:52,269 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:46:52,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735dfd3b20> has no local changes
2024-12-18 00:46:52,275 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:46:52,283 [ scc.git] DEBUG [detached HEAD fe5f6957] merge master -Dorg -Ssuccess-only
2024-12-18 00:46:52,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:46:52,284 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:46:52,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-12-18 00:46:53,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-12-18 00:46:53,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-12-18 00:46:54,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-18 00:46:54,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:46:55,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-18 00:46:55,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:46:55,537 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-12-18 00:46:55,537 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:46:55,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-18 00:46:55,537 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:55,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:55,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:46:55,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:46:55,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:46:55,552 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:46:55,557 [ scc.git] DEBUG Already up to date.
2024-12-18 00:46:55,557 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-18 00:46:55,937 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-18 00:46:55,937 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-12-18 00:46:55,941 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:46:55,941 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:55,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:55,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-18 00:46:55,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:55,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-18 00:46:56,024 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-18 00:46:56,025 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:46:56,028 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-12-18 00:46:56,028 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-18 00:46:56,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:46:56,174 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:46:56,213 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:46:56,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:46:56,219 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:46:56,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:46:56,261 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735e018e50> has no local changes
2024-12-18 00:46:56,262 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:46:56,269 [ scc.git] DEBUG [detached HEAD db7c55b] merge master -Dorg -Ssuccess-only
2024-12-18 00:46:56,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:46:56,270 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:46:56,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-18 00:46:57,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-18 00:46:57,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-18 00:46:57,711 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:46:58,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-18 00:46:58,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:46:59,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:46:59,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-18 00:47:00,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:00,245 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-18 00:47:00,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-18 00:47:00,720 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:01,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-18 00:47:01,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:02,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:02,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-18 00:47:03,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:03,346 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-18 00:47:03,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-18 00:47:03,831 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:04,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-18 00:47:04,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:05,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:05,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-18 00:47:06,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:06,362 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-18 00:47:06,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-18 00:47:07,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-18 00:47:07,266 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:07,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-18 00:47:08,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:08,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:09,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-18 00:47:09,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:09,796 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-18 00:47:10,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-18 00:47:10,280 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:10,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-18 00:47:11,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:11,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:12,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-18 00:47:12,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:12,761 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-18 00:47:13,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-18 00:47:13,234 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:13,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-18 00:47:14,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:14,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:15,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-18 00:47:15,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:15,864 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-18 00:47:15,864 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:15,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-18 00:47:15,865 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:15,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:15,870 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:15,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:15,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:15,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:15,885 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:15,885 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-18 00:47:16,217 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:16,218 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-18 00:47:16,222 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-18 00:47:16,537 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:16,538 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-18 00:47:16,542 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-18 00:47:16,871 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:16,871 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-18 00:47:16,875 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-18 00:47:17,156 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:17,157 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-18 00:47:17,162 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-18 00:47:17,454 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:17,454 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-18 00:47:17,458 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-18 00:47:17,747 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-18 00:47:17,748 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-18 00:47:17,752 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:17,752 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:17,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:17,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-18 00:47:17,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:17,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-18 00:47:17,931 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:17,936 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-18 00:47:17,936 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-18 00:47:18,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:18,086 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-18 00:47:18,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:18,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-18 00:47:18,256 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-18 00:47:18,257 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:18,262 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-18 00:47:18,262 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-18 00:47:18,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:18,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-18 00:47:18,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:18,593 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-18 00:47:18,702 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-18 00:47:18,702 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-18 00:47:18,703 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:47:18,703 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:47:18,709 [ scc.git] DEBUG Calling 'git reset --hard 120a686bef7fe8eaa87f7e6d473d0039763a2f39'
2024-12-18 00:47:18,716 [ scc.git] DEBUG HEAD is now at 120a686 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-18 00:47:18,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:18,923 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-18 00:47:18,928 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-18 00:47:18,938 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2024-12-18 00:47:18,942 [ scc.config] DEBUG Found github.token
2024-12-18 00:47:18,942 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-18 00:47:18,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-18 00:47:18,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:18,954 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-18 00:47:19,004 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-18 00:47:19,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:19,009 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-18 00:47:19,009 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-18 00:47:19,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:19,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-18 00:47:19,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:19,361 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-18 00:47:19,386 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-18 00:47:19,386 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:19,391 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-18 00:47:19,391 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-18 00:47:19,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:19,697 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-18 00:47:19,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:19,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-18 00:47:19,759 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-18 00:47:19,759 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-18 00:47:19,759 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:47:19,760 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:47:19,765 [ scc.git] DEBUG Calling 'git reset --hard 1da303e8e33b27b7aedf56ced43f43693f7c21e9'
2024-12-18 00:47:19,772 [ scc.git] DEBUG HEAD is now at 1da303e merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-18 00:47:20,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:20,082 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-18 00:47:20,088 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-18 00:47:20,094 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2024-12-18 00:47:20,099 [ scc.config] DEBUG Found github.token
2024-12-18 00:47:20,099 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-18 00:47:20,975 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-18 00:47:20,976 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:21,018 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:21,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:21,024 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:21,065 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:21,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735e01af40> has no local changes
2024-12-18 00:47:21,072 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:21,082 [ scc.git] DEBUG [detached HEAD 1fe8257] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:21,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:21,082 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:21,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-18 00:47:22,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-18 00:47:22,043 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-18 00:47:22,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-18 00:47:23,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:23,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:24,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-18 00:47:24,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:24,661 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-18 00:47:25,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-18 00:47:25,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-18 00:47:26,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-18 00:47:26,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-18 00:47:27,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-18 00:47:27,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:27,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:28,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-18 00:47:28,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:28,889 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-18 00:47:29,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-18 00:47:29,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-18 00:47:30,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-18 00:47:30,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:31,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:47:31,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-18 00:47:32,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:32,374 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-18 00:47:32,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-18 00:47:33,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-18 00:47:33,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-18 00:47:34,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:34,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-18 00:47:35,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:35,162 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-18 00:47:35,163 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:35,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-18 00:47:35,163 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:35,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:35,168 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:35,173 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:35,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:35,178 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:35,183 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:35,183 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-18 00:47:36,819 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-18 00:47:36,819 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-18 00:47:36,824 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-18 00:47:38,266 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-18 00:47:38,266 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-18 00:47:38,271 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-18 00:47:38,660 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-18 00:47:38,660 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-18 00:47:38,665 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-18 00:47:38,964 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-18 00:47:38,964 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2024-12-18 00:47:38,968 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:38,968 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:38,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:38,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-18 00:47:38,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:38,986 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-18 00:47:39,004 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-18 00:47:39,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:39,008 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-18 00:47:39,008 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-18 00:47:39,008 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-18 00:47:39,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:39,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-18 00:47:39,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:39,171 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-18 00:47:39,231 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-18 00:47:39,231 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-18 00:47:39,231 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-18 00:47:39,231 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-18 00:47:39,232 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:39,236 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-18 00:47:39,236 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-18 00:47:39,236 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-18 00:47:39,236 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-18 00:47:39,236 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-18 00:47:39,236 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-18 00:47:39,237 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-18 00:47:39,237 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-18 00:47:39,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:39,567 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-18 00:47:39,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:39,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-18 00:47:39,611 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-18 00:47:39,612 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:39,615 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-18 00:47:39,615 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-18 00:47:39,615 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-18 00:47:39,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:39,958 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-18 00:47:39,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:39,985 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-18 00:47:40,003 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:40,013 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-18 00:47:40,013 [ scc.git] DEBUG package.json | 2 +-
2024-12-18 00:47:40,013 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-18 00:47:40,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:40,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:40,390 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:40,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:40,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:40,435 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:40,445 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c779610> has no local changes
2024-12-18 00:47:40,445 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Generated by OMERO-plugins-push#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:40,458 [ scc.git] DEBUG [detached HEAD 2982100] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:40,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:40,458 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:40,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-18 00:47:41,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-18 00:47:41,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-18 00:47:42,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-18 00:47:42,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:43,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-18 00:47:43,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:43,830 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-18 00:47:43,830 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:43,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-18 00:47:43,830 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:43,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:43,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:43,841 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:43,842 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:43,847 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:43,853 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:43,853 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-18 00:47:44,617 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-18 00:47:44,617 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-18 00:47:44,622 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:44,622 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:44,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:44,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-18 00:47:44,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:44,637 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-18 00:47:44,647 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:47:44,650 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-18 00:47:44,650 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-18 00:47:44,650 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-18 00:47:44,650 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-18 00:47:44,650 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-18 00:47:44,650 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-18 00:47:44,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:44,788 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:44,826 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:44,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:44,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:44,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:44,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c78bbb0> has no local changes
2024-12-18 00:47:44,875 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:44,884 [ scc.git] DEBUG [detached HEAD 800c2a4] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:44,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:44,884 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:45,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-18 00:47:45,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-18 00:47:46,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-18 00:47:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-18 00:47:47,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:47,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-18 00:47:48,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:48,248 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-18 00:47:48,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-18 00:47:49,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-18 00:47:49,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-18 00:47:50,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:47:50,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-18 00:47:51,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:47:51,178 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-18 00:47:51,178 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:51,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-18 00:47:51,179 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:51,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:51,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:51,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:51,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:51,195 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:51,200 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:51,201 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-18 00:47:52,096 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-18 00:47:52,096 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-18 00:47:52,101 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-18 00:47:52,807 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-18 00:47:52,808 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-18 00:47:52,812 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:52,812 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:52,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:52,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-18 00:47:52,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:52,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-18 00:47:53,097 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-18 00:47:53,097 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-18 00:47:53,097 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-18 00:47:53,097 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-18 00:47:53,097 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:47:53,097 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:47:53,103 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-18 00:47:53,111 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-18 00:47:53,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:53,248 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-18 00:47:53,255 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-18 00:47:53,261 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-12-18 00:47:53,266 [ scc.config] DEBUG Found github.token
2024-12-18 00:47:53,267 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-18 00:47:53,267 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-18 00:47:53,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:53,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-18 00:47:53,365 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-18 00:47:53,365 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-18 00:47:53,365 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-18 00:47:53,365 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:47:53,365 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:47:53,371 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-18 00:47:53,379 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-18 00:47:53,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:47:53,639 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-18 00:47:53,646 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-18 00:47:53,652 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-18 00:47:53,657 [ scc.config] DEBUG Found github.token
2024-12-18 00:47:53,657 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-18 00:47:53,657 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:53,696 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:53,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:53,702 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:53,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:53,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c733880> has no local changes
2024-12-18 00:47:53,748 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:53,758 [ scc.git] DEBUG [detached HEAD 02a6a6e] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:53,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:53,758 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:54,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-18 00:47:54,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-18 00:47:55,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-18 00:47:55,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-18 00:47:56,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-18 00:47:56,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-18 00:47:57,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-18 00:47:57,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-18 00:47:57,574 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:57,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-18 00:47:57,574 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:57,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:57,580 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:57,585 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:57,585 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:57,590 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:57,595 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:57,596 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:57,596 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:57,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:57,600 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:57,637 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:57,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:57,642 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:57,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:57,686 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c733670> has no local changes
2024-12-18 00:47:57,686 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:57,695 [ scc.git] DEBUG [detached HEAD 734c3c5] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:57,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:57,695 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:57,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2024-12-18 00:47:57,983 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:47:57,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-18 00:47:57,983 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:57,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:57,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:47:57,993 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:47:57,993 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:47:57,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:47:58,003 [ scc.git] DEBUG Already up to date.
2024-12-18 00:47:58,004 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:47:58,004 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:58,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:58,008 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:47:58,047 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:47:58,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:47:58,053 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:47:58,092 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:47:58,098 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c771cd0> has no local changes
2024-12-18 00:47:58,099 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:47:58,108 [ scc.git] DEBUG [detached HEAD 2699a98] merge master -Dorg -Ssuccess-only
2024-12-18 00:47:58,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:47:58,109 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:47:58,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-18 00:47:59,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-18 00:47:59,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-18 00:47:59,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-18 00:48:00,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-18 00:48:00,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:01,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-18 00:48:01,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:01,914 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-18 00:48:01,915 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:01,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-18 00:48:01,915 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:01,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:01,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:01,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:01,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:01,932 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:01,937 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:01,937 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-18 00:48:02,332 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-18 00:48:02,332 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-18 00:48:02,336 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:02,336 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:02,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:02,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-18 00:48:02,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:02,352 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-18 00:48:02,361 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-18 00:48:02,361 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:48:02,364 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-18 00:48:02,364 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-18 00:48:02,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:02,501 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:02,540 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:02,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:02,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:02,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:02,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c760730> has no local changes
2024-12-18 00:48:02,589 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:02,597 [ scc.git] DEBUG [detached HEAD 4477dff] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:02,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:02,597 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:03,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-18 00:48:03,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-18 00:48:03,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-18 00:48:04,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-18 00:48:05,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:05,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-18 00:48:06,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:06,035 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-18 00:48:06,035 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:06,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-18 00:48:06,035 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:06,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:06,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:06,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:06,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:06,051 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:06,056 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:06,057 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-18 00:48:06,450 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-18 00:48:06,451 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-18 00:48:06,455 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:06,455 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:06,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:06,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-18 00:48:06,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:06,470 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-18 00:48:06,492 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-18 00:48:06,492 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-18 00:48:06,492 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-18 00:48:06,492 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-18 00:48:06,493 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-18 00:48:06,493 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-18 00:48:06,493 [ scc.git] DEBUG Auto-merging setup.py
2024-12-18 00:48:06,493 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-18 00:48:06,493 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:48:06,493 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:48:06,498 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-18 00:48:06,504 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2024-12-18 00:48:06,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:06,654 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-18 00:48:06,660 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-18 00:48:06,665 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-12-18 00:48:06,669 [ scc.config] DEBUG Found github.token
2024-12-18 00:48:06,670 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-18 00:48:06,670 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:06,708 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:06,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:06,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:06,751 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:06,758 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c760610> has no local changes
2024-12-18 00:48:06,758 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:06,766 [ scc.git] DEBUG [detached HEAD ea89dde] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:06,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:06,766 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:07,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-18 00:48:07,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-18 00:48:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-18 00:48:08,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-18 00:48:09,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:09,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:48:10,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-18 00:48:10,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-18 00:48:11,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-18 00:48:11,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-18 00:48:11,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-18 00:48:12,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:12,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-18 00:48:13,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:13,399 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-18 00:48:13,399 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:13,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-18 00:48:13,399 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:13,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:13,405 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:13,410 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:13,410 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:13,415 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:13,420 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:13,420 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-18 00:48:13,784 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-18 00:48:13,784 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-18 00:48:13,788 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:13,788 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:13,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:13,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-18 00:48:13,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:13,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-18 00:48:13,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-18 00:48:13,820 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-18 00:48:13,822 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-18 00:48:13,822 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-18 00:48:13,823 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-18 00:48:13,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:13,964 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:14,003 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:14,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:14,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:14,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:14,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c740c70> has no local changes
2024-12-18 00:48:14,054 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:14,062 [ scc.git] DEBUG [detached HEAD ca41d1f] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:14,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:14,062 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:14,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-18 00:48:14,389 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:14,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-18 00:48:14,389 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:14,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:14,395 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:14,399 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:14,399 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:14,404 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:14,409 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:14,409 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:14,410 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:14,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:14,414 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:14,451 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:14,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:14,456 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:14,495 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:14,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c799bb0> has no local changes
2024-12-18 00:48:14,501 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:14,510 [ scc.git] DEBUG [detached HEAD 9cedea7] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:14,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:14,510 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:14,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-18 00:48:15,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-18 00:48:15,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2024-12-18 00:48:16,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-18 00:48:16,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:17,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:48:17,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-18 00:48:18,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:18,291 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-18 00:48:18,291 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:18,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-18 00:48:18,291 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:18,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:18,297 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:18,302 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:18,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:18,307 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:18,313 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:18,314 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-18 00:48:18,965 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-18 00:48:18,965 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-18 00:48:18,969 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:18,969 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:18,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:18,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-18 00:48:18,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:18,985 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-18 00:48:18,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:48:18,996 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-18 00:48:18,996 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-18 00:48:18,996 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-18 00:48:18,996 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-18 00:48:18,996 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-18 00:48:19,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:19,150 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:19,189 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:19,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:19,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:19,232 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:19,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c75af70> has no local changes
2024-12-18 00:48:19,238 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:19,246 [ scc.git] DEBUG [detached HEAD fe95096] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:19,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:19,246 [ scc.git] INFO Overriding base-branch from master to main
2024-12-18 00:48:19,246 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:19,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-18 00:48:20,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-18 00:48:20,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-18 00:48:21,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-18 00:48:21,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:22,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:48:22,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-18 00:48:23,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-18 00:48:23,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-18 00:48:24,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-18 00:48:24,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:25,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-18 00:48:25,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:25,548 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-18 00:48:25,549 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:25,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-18 00:48:25,549 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:25,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:25,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-18 00:48:25,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:25,559 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-18 00:48:25,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-18 00:48:25,569 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:25,569 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-18 00:48:26,007 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-18 00:48:26,007 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-18 00:48:26,012 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:26,012 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:26,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-18 00:48:26,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-18 00:48:26,124 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-18 00:48:26,124 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-18 00:48:26,124 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:48:26,125 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:48:26,130 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-18 00:48:26,136 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2024-12-18 00:48:26,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:26,279 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-18 00:48:26,285 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-18 00:48:26,290 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-18 00:48:26,295 [ scc.config] DEBUG Found github.token
2024-12-18 00:48:26,295 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-18 00:48:26,295 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:26,331 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:26,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,336 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:26,373 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:26,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c6d1af0> has no local changes
2024-12-18 00:48:26,379 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:26,387 [ scc.git] DEBUG [detached HEAD 6836df1] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:26,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:26,387 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:26,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-18 00:48:26,706 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:26,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-18 00:48:26,706 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:26,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:26,715 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:26,716 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:26,721 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:26,726 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:26,726 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:26,726 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:26,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,730 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:26,769 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:26,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:26,774 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:26,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:26,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c6d1a30> has no local changes
2024-12-18 00:48:26,816 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:26,824 [ scc.git] DEBUG [detached HEAD 0ba82ca] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:26,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:26,824 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:27,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-18 00:48:27,147 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:27,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-18 00:48:27,147 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:27,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:27,152 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:27,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:27,157 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:27,162 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:27,168 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:27,168 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:27,168 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:27,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:27,173 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:27,211 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:27,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:27,216 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:27,252 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:27,258 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c6778b0> has no local changes
2024-12-18 00:48:27,258 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:27,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:27,267 [ scc.git] DEBUG [detached HEAD 65fed68] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:27,267 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:27,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-18 00:48:28,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-18 00:48:28,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-18 00:48:29,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-18 00:48:29,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:30,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-18 00:48:30,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:30,520 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-18 00:48:30,520 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:30,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-18 00:48:30,520 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:30,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:30,526 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-18 00:48:30,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:30,532 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-18 00:48:30,537 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-18 00:48:30,543 [ scc.git] DEBUG Already up to date.
2024-12-18 00:48:30,543 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-18 00:48:30,900 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-18 00:48:30,900 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-18 00:48:30,904 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:30,904 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:30,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:30,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-18 00:48:30,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:30,920 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-18 00:48:31,046 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-18 00:48:31,046 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-18 00:48:31,046 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:48:31,046 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:48:31,053 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-18 00:48:31,060 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-18 00:48:31,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:31,238 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-18 00:48:31,243 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-18 00:48:31,249 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-18 00:48:31,253 [ scc.config] DEBUG Found github.token
2024-12-18 00:48:31,253 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-18 00:48:31,253 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:31,291 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:31,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:31,296 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:31,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:31,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c6775b0> has no local changes
2024-12-18 00:48:31,341 [ 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#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:31,349 [ scc.git] DEBUG [detached HEAD 14a6241] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:31,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:31,349 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-18 00:48:31,349 [ scc.repo] DEBUG ## PRs found:
2024-12-18 00:48:31,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-18 00:48:32,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-18 00:48:32,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-18 00:48:33,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-18 00:48:33,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:34,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-18 00:48:34,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-18 00:48:35,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:35,038 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-18 00:48:35,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-18 00:48:35,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-18 00:48:36,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-18 00:48:36,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-18 00:48:37,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-18 00:48:37,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-18 00:48:37,754 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-18 00:48:38,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-18 00:48:38,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-18 00:48:39,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-18 00:48:39,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-18 00:48:39,746 [ scc.repo] DEBUG ## Branches found:
2024-12-18 00:48:39,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-18 00:48:39,746 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:39,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:39,752 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-18 00:48:39,756 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-18 00:48:39,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-18 00:48:39,761 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-18 00:48:39,774 [ scc.git] DEBUG Updating 312afbe..4b4c755
2024-12-18 00:48:40,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/216 HTTP/1.1" 200 None
2024-12-18 00:48:40,412 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-18 00:48:40,840 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-18 00:48:40,840 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-18 00:48:40,844 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-18 00:48:41,247 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-18 00:48:41,247 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-18 00:48:41,252 [ scc.git] DEBUG ## Unique users: []
2024-12-18 00:48:41,252 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:41,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:41,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-18 00:48:41,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:41,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-18 00:48:41,283 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2024-12-18 00:48:41,283 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-18 00:48:41,283 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-18 00:48:41,289 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-18 00:48:41,295 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2024-12-18 00:48:41,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:41,439 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-18 00:48:41,447 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-18 00:48:41,454 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#282](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-18 00:48:41,459 [ scc.config] DEBUG Found github.token
2024-12-18 00:48:41,459 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-18 00:48:41,459 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-18 00:48:41,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:41,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-18 00:48:41,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-18 00:48:41,484 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-18 00:48:41,484 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-18 00:48:41,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:41,826 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-18 00:48:41,865 [ scc.git] DEBUG Get sha1 of %s
2024-12-18 00:48:41,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-18 00:48:41,869 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:41,905 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:41,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f735c6f1f10> has no local changes
2024-12-18 00:48:41,911 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:41,919 [ scc.git] DEBUG [detached HEAD b8f3862] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:41,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:41,919 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-18 00:48:41,990 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-18 00:48:42,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:42,229 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-18 00:48:42,233 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-18 00:48:42,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:42,626 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-18 00:48:42,631 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-18 00:48:43,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:43,018 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-18 00:48:43,023 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-18 00:48:43,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:43,422 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-18 00:48:43,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:43,834 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-18 00:48:43,839 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-18 00:48:44,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:44,220 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-18 00:48:44,225 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-18 00:48:44,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:44,620 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-18 00:48:44,625 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-18 00:48:44,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:45,009 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-18 00:48:45,014 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-18 00:48:45,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:45,394 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-18 00:48:45,399 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-18 00:48:45,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:45,777 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-18 00:48:45,781 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-18 00:48:46,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:46,172 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-18 00:48:46,177 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-18 00:48:46,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:46,619 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-18 00:48:46,624 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-18 00:48:46,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:47,013 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-18 00:48:47,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:47,393 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-18 00:48:47,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:47,773 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-18 00:48:47,777 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-18 00:48:48,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:48,176 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-18 00:48:48,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:48,563 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-18 00:48:48,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:48,948 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-18 00:48:48,952 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-18 00:48:49,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:49,348 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-18 00:48:49,352 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-18 00:48:49,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:49,740 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-18 00:48:49,745 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-18 00:48:50,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:50,124 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-18 00:48:50,128 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-18 00:48:50,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-18 00:48:50,514 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-18 00:48:50,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-18 00:48:50,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7361436e20> has local changes
2024-12-18 00:48:50,590 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
- PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
- PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
- PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
- PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#282 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/282/)'
2024-12-18 00:48:50,602 [ scc.git] DEBUG [detached HEAD 21dc424] merge master -Dorg -Ssuccess-only
2024-12-18 00:48:50,603 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-18 00:48:50,603 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-18 00:48:50,603 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-18 00:48:50,603 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-18 00:48:50,603 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-18 00:48:50,603 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-18 00:48:50,603 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-18 00:48:50,603 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,603 [ scc.merge] INFO
2024-12-18 00:48:50,603 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,603 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-18 00:48:50,604 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-18 00:48:50,604 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-18 00:48:50,604 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-18 00:48:50,604 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-18 00:48:50,604 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-18 00:48:50,604 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,604 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-18 00:48:50,604 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-18 00:48:50,604 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-18 00:48:50,605 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-18 00:48:50,605 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-18 00:48:50,605 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-18 00:48:50,605 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-18 00:48:50,605 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-18 00:48:50,605 [ scc.merge] INFO
2024-12-18 00:48:50,605 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-18 00:48:50,605 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,605 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-18 00:48:50,606 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-18 00:48:50,606 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,606 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-18 00:48:50,606 [ scc.merge] INFO
2024-12-18 00:48:50,606 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-18 00:48:50,606 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-18 00:48:50,607 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-18 00:48:50,607 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-18 00:48:50,607 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-18 00:48:50,607 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-18 00:48:50,607 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-18 00:48:50,607 [ scc.merge] INFO Already up to date.
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-18 00:48:50,607 [ scc.merge] INFO
2024-12-18 00:48:50,607 [ scc.merge] INFO Repository: ome/scripts
2024-12-18 00:48:50,607 [ scc.merge] INFO Excluded PRs:
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-18 00:48:50,607 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-18 00:48:50,607 [ scc.merge] INFO Updating 312afbe..4b4c755
2024-12-18 00:48:50,608 [ scc.merge] INFO Previously merged:
2024-12-18 00:48:50,608 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement'
2024-12-18 00:48:50,608 [ scc.merge] INFO
2024-12-18 00:48:50,608 [ scc.merge] INFO Merged PRs:
2024-12-18 00:48:50,608 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-18 00:48:50,608 [ scc.merge] INFO
2024-12-18 00:48:50,608 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-18 00:48:50,608 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-18 00:48:50,608 [ scc.merge] INFO
2024-12-18 00:48:50,608 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-18 00:48:50,608 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-18 00:48:50,613 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-18 00:48:50,617 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-18 00:48:50,622 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-18 00:48:50,626 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-18 00:48:50,631 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-18 00:48:50,635 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-18 00:48:50,640 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-18 00:48:50,644 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-18 00:48:50,649 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-18 00:48:50,654 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-18 00:48:50,658 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-18 00:48:50,663 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-18 00:48:50,667 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-18 00:48:50,671 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-18 00:48:50,676 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-18 00:48:50,680 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-18 00:48:50,685 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-18 00:48:50,689 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-18 00:48:50,694 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-18 00:48:50,698 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-18 00:48:50,703 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-18 00:48:50,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-18 00:48:50,707 [ scc.git] DEBUG Calling 'git remote'
2024-12-18 00:48:50,712 [ 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 ec670bc] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 7c7ed9a
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 40557f5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-18 00:49:35,383 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-18 00:49:44,361 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-18 00:49:46,706 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-18 00:49:51,263 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-18 00:50:33,586 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
