Console Output
Skipping 104 KB..
Full Logb7174 cde38a507d291b03c4b821a8d4d110985ed17164'
2024-09-03 00:42:46,965 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..b540416f5b11b3d8db0e9ac71e2b3eb3d47b7174'
2024-09-03 00:42:46,971 [ scc.git] INFO - PR 577 Rdornier 'Fill rois'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/js/shape_editor/rect.js
- PR #555 will-moore 'Points in shape editor'
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
- Upstream changes
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
--conflicts
2024-09-03 00:42:46,977 [ scc.config] DEBUG Found github.token
2024-09-03 00:42:46,977 [ scc.git] DEBUG Adding comment to issue #577.
2024-09-03 00:42:47,657 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/577/comments HTTP/1.1" 201 2187
2024-09-03 00:42:47,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-03 00:42:47,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:47,674 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-03 00:42:47,742 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-03 00:42:47,743 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:42:47,747 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-03 00:42:47,747 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-03 00:42:47,747 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-03 00:42:47,747 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-03 00:42:47,747 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-03 00:42:47,747 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-03 00:42:48,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:42:48,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ffef8792902c517a3d0f2331b7bb7c125ad2c7d6'
2024-09-03 00:42:48,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:48,063 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 585 (Changelog 7.1.0) ffef8792902c517a3d0f2331b7bb7c125ad2c7d6'
2024-09-03 00:42:48,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:42:48,086 [ scc.git] DEBUG CHANGELOG.md | 12 ++++++++++++
2024-09-03 00:42:48,086 [ scc.git] DEBUG 1 file changed, 12 insertions(+)
2024-09-03 00:42:48,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:42:48,429 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:42:48,471 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:48,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:48,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:42:48,522 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:42:48,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fc6ac0> has no local changes
2024-09-03 00:42:48,530 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating cbdd3657..b540416f
Previously merged:
- PR 560 will-moore 'Max projection bytes'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 585 will-moore 'Changelog 7.1.0'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:42:48,541 [ scc.git] DEBUG [detached HEAD 6fc942cd] merge master -Dorg -Ssuccess-only
2024-09-03 00:42:48,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:42:48,542 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:42:48,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-03 00:42:49,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-03 00:42:49,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-03 00:42:50,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-03 00:42:50,783 [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-09-03 00:42:51,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-03 00:42:51,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:42:51,728 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-03 00:42:51,728 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:42:51,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-03 00:42:51,729 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:51,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:51,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:42:51,740 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:42:51,740 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:42:51,745 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:42:51,749 [ scc.git] DEBUG Already up to date.
2024-09-03 00:42:51,750 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-03 00:42:52,081 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-03 00:42:52,081 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-03 00:42:52,086 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:42:52,086 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:52,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:52,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-03 00:42:52,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:52,102 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-03 00:42:52,138 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-03 00:42:52,139 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:42:52,142 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-03 00:42:52,142 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-03 00:42:52,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:42:52,372 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:42:52,413 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:52,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:52,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:42:52,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:42:52,465 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fc6a00> has no local changes
2024-09-03 00:42:52,465 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:42:52,474 [ scc.git] DEBUG [detached HEAD c2cb77d] merge master -Dorg -Ssuccess-only
2024-09-03 00:42:52,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:42:52,474 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:42:52,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-03 00:42:53,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-03 00:42:53,277 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:42:53,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-03 00:42:54,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:42:54,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:42:55,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-03 00:42:55,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:42:55,784 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-03 00:42:55,784 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:42:55,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-03 00:42:55,784 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:55,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:55,790 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:42:55,795 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:42:55,796 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:42:55,801 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:42:55,807 [ scc.git] DEBUG Already up to date.
2024-09-03 00:42:55,808 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-03 00:42:56,112 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-03 00:42:56,112 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-03 00:42:56,116 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:42:56,117 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:56,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:56,122 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-03 00:42:56,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:56,131 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-03 00:42:56,141 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:42:56,146 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-03 00:42:56,146 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-03 00:42:56,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:42:56,283 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:42:56,327 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:42:56,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:42:56,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:42:56,371 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:42:56,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fc6a60> has no local changes
2024-09-03 00:42:56,379 [ 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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:42:56,388 [ scc.git] DEBUG [detached HEAD d0f11b3] merge master -Dorg -Ssuccess-only
2024-09-03 00:42:56,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:42:56,389 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:42:56,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-03 00:42:57,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-03 00:42:57,320 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:42:57,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-03 00:42:58,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:42:58,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:42:59,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-03 00:42:59,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:42:59,669 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-03 00:43:00,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-03 00:43:00,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-03 00:43:01,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-03 00:43:01,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:02,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:02,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-03 00:43:02,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:02,933 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-03 00:43:03,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-03 00:43:03,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-03 00:43:03,870 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:43:04,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-03 00:43:05,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:05,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:06,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-03 00:43:06,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:06,492 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-03 00:43:06,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-03 00:43:06,943 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:43:07,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-03 00:43:07,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:08,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:09,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-03 00:43:09,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:09,497 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-03 00:43:09,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-03 00:43:10,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-03 00:43:10,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-03 00:43:11,335 [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-09-03 00:43:11,799 [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-09-03 00:43:12,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-03 00:43:12,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:12,657 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-03 00:43:13,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-03 00:43:13,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-03 00:43:14,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-03 00:43:14,530 [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-09-03 00:43:15,024 [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-09-03 00:43:15,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-03 00:43:15,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:15,895 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-03 00:43:16,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-03 00:43:16,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-03 00:43:17,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-03 00:43:17,662 [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-09-03 00:43:18,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-03 00:43:18,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:18,546 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-03 00:43:18,546 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:43:18,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-03 00:43:18,547 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:18,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:18,555 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:43:18,560 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:43:18,560 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:43:18,608 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:43:18,614 [ scc.git] DEBUG Already up to date.
2024-09-03 00:43:18,615 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-03 00:43:19,104 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:19,104 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-03 00:43:19,110 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-03 00:43:20,083 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:20,084 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-03 00:43:20,089 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-03 00:43:20,466 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:20,466 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-03 00:43:20,476 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-03 00:43:20,758 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:20,758 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-03 00:43:20,764 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-03 00:43:21,135 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:21,136 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-03 00:43:21,148 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-03 00:43:21,485 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:21,485 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-03 00:43:21,490 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-03 00:43:21,788 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-03 00:43:21,788 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-03 00:43:21,796 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:43:21,796 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:21,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:21,805 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-03 00:43:21,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:21,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-03 00:43:21,924 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-03 00:43:21,927 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:21,934 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-03 00:43:21,934 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-03 00:43:21,934 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-03 00:43:22,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:22,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-03 00:43:22,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:22,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-03 00:43:22,250 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-03 00:43:22,250 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-03 00:43:22,250 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-03 00:43:22,250 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-03 00:43:22,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:22,262 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-03 00:43:22,262 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-03 00:43:22,262 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-03 00:43:22,263 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-03 00:43:22,263 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-03 00:43:22,263 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-03 00:43:22,263 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-03 00:43:22,263 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-03 00:43:22,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:22,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-03 00:43:22,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:22,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-03 00:43:22,618 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-03 00:43:22,619 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:22,629 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-03 00:43:22,629 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-03 00:43:22,629 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-03 00:43:22,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:22,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-03 00:43:22,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:22,922 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-03 00:43:22,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:22,979 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-03 00:43:22,979 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-03 00:43:23,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:23,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-03 00:43:23,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:23,327 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-03 00:43:23,373 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-03 00:43:23,374 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:23,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:23,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-03 00:43:23,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:23,712 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-03 00:43:23,851 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-03 00:43:23,851 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-03 00:43:23,851 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-03 00:43:23,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-03 00:43:23,857 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-03 00:43:23,857 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-03 00:43:24,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:24,084 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-03 00:43:24,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:24,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-03 00:43:24,234 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-03 00:43:24,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:24,246 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-03 00:43:24,246 [ scc.git] DEBUG package.json | 2 +-
2024-09-03 00:43:24,246 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-03 00:43:24,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:24,468 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:43:24,514 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:24,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:24,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:43:24,564 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:43:24,575 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fe6bb0> has no local changes
2024-09-03 00:43:24,575 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:43:24,589 [ scc.git] DEBUG [detached HEAD 2fa417b] merge master -Dorg -Ssuccess-only
2024-09-03 00:43:24,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:43:24,590 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:43:24,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-03 00:43:25,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-03 00:43:25,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-03 00:43:26,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-03 00:43:26,902 [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-09-03 00:43:27,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:27,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-03 00:43:28,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:28,131 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-03 00:43:28,131 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:43:28,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-03 00:43:28,131 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:28,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:28,145 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:43:28,154 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:43:28,154 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:43:28,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:43:28,167 [ scc.git] DEBUG Already up to date.
2024-09-03 00:43:28,167 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-03 00:43:28,594 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-03 00:43:28,594 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-03 00:43:28,599 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:43:28,599 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:28,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:28,604 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-03 00:43:28,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:28,616 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-03 00:43:28,625 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:28,628 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-03 00:43:28,628 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-03 00:43:28,628 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-03 00:43:28,628 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-03 00:43:28,628 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-03 00:43:28,628 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-03 00:43:28,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:28,768 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:43:28,808 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:28,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:28,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:43:28,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:43:28,859 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e878b7f0> has no local changes
2024-09-03 00:43:28,859 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:43:28,868 [ scc.git] DEBUG [detached HEAD 82535a5] merge master -Dorg -Ssuccess-only
2024-09-03 00:43:28,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:43:28,869 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:43:29,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-03 00:43:29,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-03 00:43:30,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-03 00:43:30,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-03 00:43:31,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:31,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-03 00:43:31,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:31,990 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-03 00:43:32,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-03 00:43:32,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-03 00:43:33,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-03 00:43:33,915 [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-09-03 00:43:34,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-03 00:43:34,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:34,758 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-03 00:43:35,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-03 00:43:35,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-03 00:43:36,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-03 00:43:36,726 [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-09-03 00:43:37,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-03 00:43:37,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:37,636 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-03 00:43:37,636 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:43:37,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-03 00:43:37,636 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:37,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:37,643 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:43:37,648 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:43:37,648 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:43:37,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:43:37,660 [ scc.git] DEBUG Already up to date.
2024-09-03 00:43:37,660 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-03 00:43:38,162 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-03 00:43:38,162 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-03 00:43:38,167 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-03 00:43:38,656 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-03 00:43:38,656 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-03 00:43:38,661 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-03 00:43:38,936 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-03 00:43:38,936 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-03 00:43:38,941 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:43:38,941 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:38,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:38,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-03 00:43:38,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:38,961 [ 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-09-03 00:43:39,051 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-03 00:43:39,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-03 00:43:39,051 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-03 00:43:39,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-03 00:43:39,051 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:43:39,052 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:43:39,059 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-03 00:43:39,066 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-03 00:43:39,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:39,197 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-03 00:43:39,204 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-03 00:43:39,209 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-03 00:43:39,214 [ scc.config] DEBUG Found github.token
2024-09-03 00:43:39,214 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-03 00:43:39,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-03 00:43:39,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:39,225 [ 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-09-03 00:43:39,269 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-03 00:43:39,269 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-03 00:43:39,269 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-03 00:43:39,269 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:43:39,269 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:43:39,276 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-03 00:43:39,283 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-03 00:43:39,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:39,590 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-03 00:43:39,598 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-03 00:43:39,604 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/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-09-03 00:43:39,609 [ scc.config] DEBUG Found github.token
2024-09-03 00:43:39,609 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-03 00:43:39,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-03 00:43:39,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:39,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-03 00:43:39,640 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:39,643 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-03 00:43:39,643 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-03 00:43:39,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:39,986 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:43:40,027 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:40,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:40,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:43:40,075 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:43:40,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e878b5b0> has no local changes
2024-09-03 00:43:40,083 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:43:40,091 [ scc.git] DEBUG [detached HEAD a6373dc] merge master -Dorg -Ssuccess-only
2024-09-03 00:43:40,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:43:40,091 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:43:40,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-03 00:43:40,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-03 00:43:40,947 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:43:41,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-03 00:43:41,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:42,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:42,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-03 00:43:43,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:43,361 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-03 00:43:43,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-03 00:43:43,819 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:43:44,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-03 00:43:44,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:45,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:45,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-03 00:43:46,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:46,178 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-03 00:43:46,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-03 00:43:46,646 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-03 00:43:47,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-03 00:43:47,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:48,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-03 00:43:48,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-03 00:43:48,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:48,933 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-03 00:43:49,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-03 00:43:49,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-03 00:43:50,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-03 00:43:50,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-03 00:43:51,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-03 00:43:51,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-03 00:43:51,670 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:43:51,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-03 00:43:51,671 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:51,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:51,677 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:43:51,683 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:43:51,683 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:43:51,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:43:51,696 [ scc.git] DEBUG Already up to date.
2024-09-03 00:43:51,696 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-03 00:43:51,999 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-03 00:43:51,999 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-03 00:43:52,004 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-03 00:43:52,300 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-03 00:43:52,301 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-03 00:43:52,307 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-03 00:43:52,589 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-03 00:43:52,589 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-03 00:43:52,594 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:43:52,594 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:52,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:52,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-03 00:43:52,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:52,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-03 00:43:52,625 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:52,628 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-03 00:43:52,628 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-03 00:43:52,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:52,764 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-03 00:43:52,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:52,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-03 00:43:52,869 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-03 00:43:52,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:52,877 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-03 00:43:52,877 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-03 00:43:53,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:53,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-03 00:43:53,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:53,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-03 00:43:53,218 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-03 00:43:53,219 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:53,223 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-03 00:43:53,223 [ scc.git] DEBUG package.json | 2 +-
2024-09-03 00:43:53,223 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-03 00:43:53,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:53,540 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:43:53,594 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:53,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:53,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:43:53,646 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:43:53,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fe7ca0> has no local changes
2024-09-03 00:43:53,655 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- 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.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:43:53,667 [ scc.git] DEBUG [detached HEAD 00727d0] merge master -Dorg -Ssuccess-only
2024-09-03 00:43:53,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:43:53,668 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:43:54,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-03 00:43:54,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-03 00:43:54,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-03 00:43:55,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-03 00:43:55,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-03 00:43:56,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:43:56,317 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-03 00:43:56,317 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:43:56,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-03 00:43:56,318 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:56,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:56,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:43:56,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:43:56,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:43:56,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:43:56,343 [ scc.git] DEBUG Already up to date.
2024-09-03 00:43:56,344 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-03 00:43:56,636 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-03 00:43:56,636 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-03 00:43:56,641 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:43:56,641 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:56,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:56,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-03 00:43:56,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:56,659 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-03 00:43:56,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:43:56,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:43:56,810 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:43:56,853 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:43:56,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:43:56,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:43:56,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:43:56,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e9fdedf0> has no local changes
2024-09-03 00:43:56,906 [ 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.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:43:56,915 [ scc.git] DEBUG [detached HEAD 9dca8bb] merge master -Dorg -Ssuccess-only
2024-09-03 00:43:56,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:43:56,916 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:43:57,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-03 00:43:57,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-03 00:43:58,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-03 00:43:58,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-03 00:43:59,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-03 00:43:59,594 [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-09-03 00:44:00,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-03 00:44:00,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:44:00,518 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-03 00:44:00,518 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:00,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-03 00:44:00,518 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:00,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:00,525 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:00,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:00,532 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:00,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:00,546 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:00,546 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-03 00:44:00,910 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-03 00:44:00,911 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-03 00:44:00,916 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:00,916 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:00,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:00,924 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-03 00:44:00,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:00,941 [ 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-09-03 00:44:00,952 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-03 00:44:00,952 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:44:00,955 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-03 00:44:00,955 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-03 00:44:01,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:01,092 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:01,133 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:01,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:01,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:01,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:01,190 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e87a0c10> has no local changes
2024-09-03 00:44:01,190 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:01,200 [ scc.git] DEBUG [detached HEAD 15547ea] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:01,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:01,201 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:01,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-03 00:44:02,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-03 00:44:02,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-03 00:44:03,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-03 00:44:03,532 [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-09-03 00:44:04,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-03 00:44:04,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:44:04,440 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-03 00:44:04,440 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:04,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-03 00:44:04,440 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:04,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:04,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:04,452 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:04,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:04,458 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:04,465 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:04,465 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-03 00:44:04,838 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-03 00:44:04,839 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-03 00:44:04,843 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:04,844 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:04,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:04,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-03 00:44:04,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:04,862 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-03 00:44:04,889 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG Auto-merging setup.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-03 00:44:04,889 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:44:04,890 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:44:04,896 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-03 00:44:04,903 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-03 00:44:05,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:05,064 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-03 00:44:05,071 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-03 00:44:05,077 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-09-03 00:44:05,081 [ scc.config] DEBUG Found github.token
2024-09-03 00:44:05,082 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-03 00:44:05,082 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:05,121 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:05,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:05,126 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:05,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:05,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e878dcd0> has no local changes
2024-09-03 00:44:05,172 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:05,181 [ scc.git] DEBUG [detached HEAD 2b6053f] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:05,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:05,182 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:05,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-03 00:44:05,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-03 00:44:06,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-03 00:44:06,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-03 00:44:07,338 [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-09-03 00:44:07,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-03 00:44:08,204 [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-09-03 00:44:08,205 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-03 00:44:08,205 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:08,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-03 00:44:08,206 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:08,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:08,214 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:08,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:08,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:08,224 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:08,229 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:08,229 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-03 00:44:08,678 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-03 00:44:08,678 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-03 00:44:08,684 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:08,684 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:08,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:08,689 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-03 00:44:08,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:08,702 [ 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-09-03 00:44:08,738 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-03 00:44:08,741 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-03 00:44:08,744 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-03 00:44:08,744 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-03 00:44:08,745 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-03 00:44:08,745 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-03 00:44:08,745 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-03 00:44:08,746 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-03 00:44:08,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:08,887 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:08,926 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:08,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:08,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:08,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:08,976 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e877feb0> has no local changes
2024-09-03 00:44:08,977 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:08,985 [ scc.git] DEBUG [detached HEAD 0358268] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:08,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:08,986 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:09,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-03 00:44:09,300 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:09,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-03 00:44:09,300 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:09,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:09,314 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:09,320 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:09,335 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:09,336 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:09,336 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:09,386 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:09,432 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:09,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e870cdf0> has no local changes
2024-09-03 00:44:09,438 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:09,448 [ scc.git] DEBUG [detached HEAD bef5454] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:09,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:09,448 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:09,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-03 00:44:09,737 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:09,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-03 00:44:09,738 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,744 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:09,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:09,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:09,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:09,760 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:09,760 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:09,760 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,765 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:09,802 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:09,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:09,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:09,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:09,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e87727c0> has no local changes
2024-09-03 00:44:09,854 [ 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.
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:09,863 [ scc.git] DEBUG [detached HEAD e06b9fc] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:09,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:09,863 [ scc.git] INFO Overriding base-branch from master to main
2024-09-03 00:44:09,864 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:10,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-03 00:44:10,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-03 00:44:11,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-03 00:44:11,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-03 00:44:12,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-03 00:44:12,576 [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-09-03 00:44:13,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-03 00:44:13,463 [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-09-03 00:44:13,464 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-03 00:44:13,465 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:13,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-03 00:44:13,465 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:13,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:13,472 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-03 00:44:13,477 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:13,477 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-03 00:44:13,482 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-03 00:44:13,488 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:13,488 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-03 00:44:13,842 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-03 00:44:13,843 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-03 00:44:13,848 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:13,848 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:13,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:13,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-03 00:44:13,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:13,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-03 00:44:13,891 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-03 00:44:13,892 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-03 00:44:13,892 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:44:13,892 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:44:13,898 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-03 00:44:13,905 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-03 00:44:14,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:14,049 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-03 00:44:14,056 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-03 00:44:14,062 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-03 00:44:14,067 [ scc.config] DEBUG Found github.token
2024-09-03 00:44:14,067 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-03 00:44:14,067 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:14,107 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,115 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:14,166 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:14,175 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e872bbb0> has no local changes
2024-09-03 00:44:14,175 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:14,187 [ scc.git] DEBUG [detached HEAD 603a55c] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:14,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:14,187 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:14,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-03 00:44:14,485 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:14,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-03 00:44:14,485 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:14,497 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:14,497 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:14,502 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:14,508 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:14,508 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:14,508 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,513 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:14,551 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,558 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:14,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:14,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e86d07c0> has no local changes
2024-09-03 00:44:14,612 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:14,623 [ scc.git] DEBUG [detached HEAD 8b3e50a] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:14,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:14,624 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:14,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-03 00:44:14,885 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:14,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-03 00:44:14,885 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:14,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:14,900 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:14,907 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:14,914 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:14,914 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:14,914 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,920 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:14,957 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:14,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:14,963 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:15,009 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:15,017 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e86d0610> has no local changes
2024-09-03 00:44:15,017 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:15,027 [ scc.git] DEBUG [detached HEAD db3e6d4] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:15,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:15,027 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:15,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-03 00:44:15,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-03 00:44:16,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-03 00:44:16,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-03 00:44:17,224 [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-09-03 00:44:17,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-03 00:44:18,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:44:18,116 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-03 00:44:18,116 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:18,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-03 00:44:18,116 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:18,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:18,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-03 00:44:18,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:18,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-03 00:44:18,135 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-03 00:44:18,140 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:18,141 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-03 00:44:18,470 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-03 00:44:18,470 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-03 00:44:18,476 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:18,477 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:18,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:18,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-03 00:44:18,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:18,495 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-03 00:44:18,566 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-03 00:44:18,566 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-03 00:44:18,566 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:44:18,566 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:44:18,573 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-03 00:44:18,581 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-03 00:44:18,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:18,715 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-03 00:44:18,722 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-03 00:44:18,728 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-03 00:44:18,734 [ scc.config] DEBUG Found github.token
2024-09-03 00:44:18,735 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-03 00:44:18,735 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:18,777 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:18,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:18,783 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:18,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:18,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e8701ca0> has no local changes
2024-09-03 00:44:18,832 [ 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#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:18,842 [ scc.git] DEBUG [detached HEAD 218c218] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:18,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:18,843 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-03 00:44:18,843 [ scc.repo] DEBUG ## PRs found:
2024-09-03 00:44:19,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-03 00:44:19,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-03 00:44:20,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-03 00:44:20,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-03 00:44:21,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-03 00:44:21,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-03 00:44:21,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-03 00:44:22,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-03 00:44:22,912 [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-09-03 00:44:23,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-03 00:44:23,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-03 00:44:23,810 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-03 00:44:24,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-03 00:44:24,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-03 00:44:25,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-03 00:44:25,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-03 00:44:25,646 [ scc.repo] DEBUG ## Branches found:
2024-09-03 00:44:25,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-03 00:44:25,646 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:25,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:25,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-03 00:44:25,661 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-03 00:44:25,661 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-03 00:44:25,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-03 00:44:25,673 [ scc.git] DEBUG Already up to date.
2024-09-03 00:44:25,674 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-03 00:44:26,195 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-03 00:44:26,195 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-03 00:44:26,200 [ scc.git] DEBUG ## Unique users: []
2024-09-03 00:44:26,200 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:26,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:26,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-03 00:44:26,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:26,218 [ 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-09-03 00:44:26,258 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-03 00:44:26,258 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-03 00:44:26,259 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-03 00:44:26,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-03 00:44:26,266 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-03 00:44:26,276 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-03 00:44:26,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:26,423 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-03 00:44:26,431 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-03 00:44:26,438 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#173](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-03 00:44:26,445 [ scc.config] DEBUG Found github.token
2024-09-03 00:44:26,445 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-03 00:44:26,445 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-03 00:44:26,485 [ scc.git] DEBUG Get sha1 of %s
2024-09-03 00:44:26,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-03 00:44:26,492 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:26,535 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:26,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10e8705f10> has no local changes
2024-09-03 00:44:26,543 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:26,553 [ scc.git] DEBUG [detached HEAD 86f8494] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:26,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:26,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-03 00:44:26,634 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-03 00:44:26,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:26,812 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-03 00:44:26,817 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-03 00:44:27,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:27,191 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-03 00:44:27,195 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-03 00:44:27,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:27,579 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-03 00:44:27,583 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-03 00:44:27,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:27,968 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-03 00:44:28,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:28,345 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-03 00:44:28,350 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-03 00:44:28,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:28,732 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-03 00:44:28,738 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-03 00:44:29,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:29,143 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-03 00:44:29,149 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-03 00:44:29,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:29,523 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-03 00:44:29,528 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-03 00:44:29,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:29,918 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-03 00:44:29,929 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-03 00:44:30,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:30,283 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-03 00:44:30,291 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-03 00:44:30,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:30,674 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-03 00:44:30,679 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-03 00:44:31,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:31,064 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-03 00:44:31,069 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-03 00:44:31,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:31,463 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-03 00:44:31,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:31,855 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-03 00:44:32,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:32,229 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-03 00:44:32,235 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-03 00:44:32,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:32,616 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-03 00:44:32,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:33,001 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-03 00:44:33,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:33,377 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-03 00:44:33,383 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-03 00:44:33,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:33,753 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-03 00:44:33,757 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-03 00:44:34,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:34,131 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-03 00:44:34,136 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-03 00:44:34,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:34,557 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-03 00:44:34,565 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-03 00:44:34,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-03 00:44:34,947 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-03 00:44:34,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-03 00:44:35,034 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f10f1140760> has local changes
2024-09-03 00:44:35,035 [ 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 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (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 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating cbdd3657..b540416f
Previously merged:
- PR 560 will-moore 'Max projection bytes'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 585 will-moore 'Changelog 7.1.0'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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 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.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
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
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.
Repository: ome/omero-web-zarr
Excluded PRs:
- 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 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#173 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/173/)'
2024-09-03 00:44:35,050 [ scc.git] DEBUG [detached HEAD 95d3ed9] merge master -Dorg -Ssuccess-only
2024-09-03 00:44:35,050 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-03 00:44:35,050 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-03 00:44:35,051 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-03 00:44:35,051 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-03 00:44:35,051 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-03 00:44:35,051 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-03 00:44:35,051 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-03 00:44:35,051 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,051 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-03 00:44:35,051 [ scc.merge] INFO
2024-09-03 00:44:35,051 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-03 00:44:35,051 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-03 00:44:35,052 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-03 00:44:35,052 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image' (user: Rdornier)
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (status: failure)
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-03 00:44:35,052 [ scc.merge] INFO Updating cbdd3657..b540416f
2024-09-03 00:44:35,052 [ scc.merge] INFO Previously merged:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 585 will-moore 'Changelog 7.1.0'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-03 00:44:35,052 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,052 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-03 00:44:35,052 [ scc.merge] INFO
2024-09-03 00:44:35,052 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-03 00:44:35,053 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-03 00:44:35,053 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-03 00:44:35,053 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-03 00:44:35,053 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-03 00:44:35,053 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-03 00:44:35,053 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-03 00:44:35,053 [ scc.merge] INFO
2024-09-03 00:44:35,053 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-03 00:44:35,053 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-03 00:44:35,054 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-03 00:44:35,054 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-03 00:44:35,054 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-03 00:44:35,054 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-03 00:44:35,054 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-03 00:44:35,054 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-03 00:44:35,054 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,054 [ scc.merge] INFO Merged PRs:
2024-09-03 00:44:35,054 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-03 00:44:35,054 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-03 00:44:35,055 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-03 00:44:35,055 [ scc.merge] INFO
2024-09-03 00:44:35,055 [ scc.merge] INFO Repository: ome/scripts
2024-09-03 00:44:35,055 [ scc.merge] INFO Excluded PRs:
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-03 00:44:35,055 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-03 00:44:35,055 [ scc.merge] INFO Already up to date.
2024-09-03 00:44:35,056 [ scc.merge] INFO
2024-09-03 00:44:35,056 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-03 00:44:35,056 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-03 00:44:35,056 [ scc.merge] INFO
2024-09-03 00:44:35,056 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-03 00:44:35,056 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-03 00:44:35,062 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-03 00:44:35,069 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-03 00:44:35,075 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-03 00:44:35,080 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-03 00:44:35,087 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-03 00:44:35,093 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-03 00:44:35,099 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-03 00:44:35,105 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-03 00:44:35,111 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-03 00:44:35,116 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-03 00:44:35,121 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-03 00:44:35,127 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-03 00:44:35,132 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-03 00:44:35,137 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-03 00:44:35,142 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-03 00:44:35,147 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-03 00:44:35,153 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-03 00:44:35,158 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-03 00:44:35,163 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-03 00:44:35,168 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-03 00:44:35,173 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-03 00:44:35,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-03 00:44:35,178 [ scc.git] DEBUG Calling 'git remote'
2024-09-03 00:44:35,183 [ 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.9.2 to 5.9.4-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 0fac448] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 cbdd3657
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
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 aca9e9c
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 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
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 005227f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-09-03 00:45:20,650 [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-09-03 00:45:29,219 [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-09-03 00:45:31,574 [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-09-03 00:45:35,919 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-03 00:46:15,166 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
