Console Output
Skipping 117 KB..
Full Logit] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-29 00:44:40,136 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-29 00:44:40,136 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-29 00:44:40,137 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-29 00:44:40,137 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-29 00:44:40,137 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-29 00:44:40,137 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-29 00:44:40,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:40,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54'
2024-04-29 00:44:40,347 [ scc.git] ERROR stderr (git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54): warning: HEAD...05cb9d985242252c32324050a4895e2c03203f54: multiple merge bases, using 852b5109c4c0503d2740da64714512e83c619db0
2024-04-29 00:44:40,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:40,355 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 05cb9d985242252c32324050a4895e2c03203f54'
2024-04-29 00:44:40,505 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-04-29 00:44:40,506 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-04-29 00:44:40,506 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/views/right_panel_view.js
2024-04-29 00:44:40,506 [ scc.git] DEBUG Auto-merging src/js/views/util.js
2024-04-29 00:44:40,506 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:44:40,507 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:44:40,518 [ scc.git] DEBUG Calling 'git reset --hard 5cd0f4d320d2d59c189067d04fd1000e016baa55'
2024-04-29 00:44:40,533 [ scc.git] DEBUG HEAD is now at 5cd0f4d3 merge master -Dorg -Ssuccess-only: PR 477 (Vite)
2024-04-29 00:44:40,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:40,700 [ scc.git] DEBUG Calling 'git merge-base e5a45d6081c9064d2b676a4b772ab399ae2b7f02 05cb9d985242252c32324050a4895e2c03203f54'
2024-04-29 00:44:40,712 [ scc.git] DEBUG Calling 'git diff --name-only 852b5109c4c0503d2740da64714512e83c619db0..e5a45d6081c9064d2b676a4b772ab399ae2b7f02'
2024-04-29 00:44:40,718 [ scc.git] INFO - PR 549 will-moore 'Inset feature'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- PR #477 will-moore 'Vite'
- src/js/views/right_panel_view.js
--conflicts
2024-04-29 00:44:40,722 [ scc.config] DEBUG Found github.token
2024-04-29 00:44:40,722 [ scc.git] DEBUG Adding comment to issue #549.
2024-04-29 00:44:41,514 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/549/comments HTTP/1.1" 201 1977
2024-04-29 00:44:41,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-29 00:44:41,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:41,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-29 00:44:41,580 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:44:41,583 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-29 00:44:41,583 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-29 00:44:41,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:41,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-29 00:44:41,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:41,946 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-29 00:44:41,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 479 ++++++++++++++++++++++-
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-04-29 00:44:41,992 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-04-29 00:44:41,992 [ scc.git] DEBUG 8 files changed, 501 insertions(+), 7 deletions(-)
2024-04-29 00:44:41,992 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-04-29 00:44:42,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:42,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:44:42,385 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:42,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:42,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:44:42,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:44:42,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0441be0> has no local changes
2024-04-29 00:44:42,443 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating 87d179a0..e5a45d60
Previously merged:
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Conflicting PRs (not included):
- PR 549 will-moore 'Inset feature'
Generated by OMERO-plugins-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:44:42,454 [ scc.git] DEBUG [detached HEAD df6b238d] merge master -Dorg -Ssuccess-only
2024-04-29 00:44:42,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:44:42,454 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:44:42,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-29 00:44:43,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-29 00:44:43,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-29 00:44:44,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-29 00:44:44,709 [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-04-29 00:44:45,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-29 00:44:45,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:44:45,626 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-29 00:44:45,627 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:44:45,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-29 00:44:45,627 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:45,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:45,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:44:45,668 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:44:45,669 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:44:45,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:44:45,698 [ scc.git] DEBUG Already up to date.
2024-04-29 00:44:45,699 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-29 00:44:46,095 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-29 00:44:46,095 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-29 00:44:46,103 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:44:46,103 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:46,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:46,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-29 00:44:46,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:46,142 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-29 00:44:46,179 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-29 00:44:46,180 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:44:46,184 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-29 00:44:46,184 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-29 00:44:46,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:46,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:44:46,395 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:46,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:46,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:44:46,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:44:46,453 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03f8550> has no local changes
2024-04-29 00:44:46,454 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:44:46,464 [ scc.git] DEBUG [detached HEAD 14ae589] merge master -Dorg -Ssuccess-only
2024-04-29 00:44:46,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:44:46,465 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:44:46,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-29 00:44:47,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-29 00:44:47,364 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-29 00:44:47,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-29 00:44:48,406 [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-04-29 00:44:48,909 [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-04-29 00:44:49,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-29 00:44:49,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:44:49,764 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-29 00:44:49,764 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:44:49,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-29 00:44:49,764 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:49,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:49,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:44:49,779 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:44:49,780 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:44:49,786 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:44:49,792 [ scc.git] DEBUG Already up to date.
2024-04-29 00:44:49,793 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-29 00:44:50,188 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-29 00:44:50,188 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-29 00:44:50,197 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:44:50,197 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:50,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:50,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-29 00:44:50,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:50,230 [ 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-04-29 00:44:50,248 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:44:50,253 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-29 00:44:50,253 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-29 00:44:50,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:44:50,420 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:44:50,466 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:44:50,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:44:50,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:44:50,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:44:50,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0400820> has no local changes
2024-04-29 00:44:50,528 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:44:50,539 [ scc.git] DEBUG [detached HEAD 5280578] merge master -Dorg -Ssuccess-only
2024-04-29 00:44:50,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:44:50,540 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:44:50,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-29 00:44:51,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-29 00:44:51,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-04-29 00:44:52,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-29 00:44:52,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:44:53,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:44:53,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-29 00:44:54,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/fb31a249bfe16120da3403c6e450afad9f8db7e1?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:44:54,278 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-29 00:44:54,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-29 00:44:55,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-29 00:44:55,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-29 00:44:56,186 [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-04-29 00:44:56,644 [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-04-29 00:44:57,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-29 00:44:57,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:44:57,480 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-29 00:44:58,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-29 00:44:58,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-29 00:44:59,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-29 00:44:59,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:44:59,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:45:00,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-29 00:45:00,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:00,784 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-29 00:45:01,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-29 00:45:01,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-29 00:45:02,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:45:02,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:45:03,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-29 00:45:03,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:03,702 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-29 00:45:04,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-29 00:45:04,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-29 00:45:05,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-29 00:45:05,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:45:06,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:45:06,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-29 00:45:07,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:07,057 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-29 00:45:07,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-29 00:45:07,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-29 00:45:08,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-29 00:45:08,931 [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-04-29 00:45:09,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-29 00:45:09,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:09,862 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-29 00:45:09,862 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:09,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-29 00:45:09,863 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:09,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:09,884 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:09,891 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:09,891 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:09,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:09,905 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:09,905 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-29 00:45:10,406 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:10,406 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-29 00:45:10,413 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-29 00:45:11,637 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:11,638 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-29 00:45:11,643 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-29 00:45:12,039 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:12,039 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-29 00:45:12,044 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-29 00:45:12,865 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:12,865 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-29 00:45:12,871 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-29 00:45:13,319 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:13,319 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-29 00:45:13,324 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-29 00:45:13,788 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-29 00:45:13,788 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-29 00:45:13,793 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:13,793 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:13,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:13,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-29 00:45:13,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:13,811 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-29 00:45:13,840 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:13,844 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-29 00:45:13,844 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-29 00:45:13,844 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-29 00:45:14,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:14,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-29 00:45:14,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:14,016 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-29 00:45:14,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:14,079 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-29 00:45:14,079 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-29 00:45:14,079 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-29 00:45:14,079 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-29 00:45:14,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:14,405 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-29 00:45:14,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:14,417 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-29 00:45:14,443 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:14,447 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-29 00:45:14,447 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-29 00:45:14,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:14,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-29 00:45:14,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:14,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-29 00:45:14,936 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-29 00:45:14,936 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:14,942 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-29 00:45:14,942 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-29 00:45:14,942 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-29 00:45:15,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:15,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-29 00:45:15,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:15,238 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-29 00:45:15,295 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-29 00:45:15,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:15,300 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-29 00:45:15,300 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-29 00:45:15,300 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-29 00:45:15,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:15,641 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-29 00:45:15,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:15,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-29 00:45:15,732 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-29 00:45:15,732 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-29 00:45:15,732 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-29 00:45:15,733 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:15,737 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-29 00:45:15,737 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 11 ++++++-----
2024-04-29 00:45:15,737 [ scc.git] DEBUG src/model/image_info.js | 41 +++++++++++++++++++++++++++++++++++++++++
2024-04-29 00:45:15,737 [ scc.git] DEBUG 3 files changed, 51 insertions(+), 5 deletions(-)
2024-04-29 00:45:16,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:16,045 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:16,122 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:16,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:16,130 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:16,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:16,185 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03d65b0> has no local changes
2024-04-29 00:45:16,185 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:16,198 [ scc.git] DEBUG [detached HEAD b2b3d4b] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:16,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:16,198 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:16,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-29 00:45:17,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-29 00:45:17,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-29 00:45:18,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-29 00:45:18,543 [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-04-29 00:45:19,024 [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-04-29 00:45:19,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-29 00:45:19,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:19,887 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-29 00:45:19,888 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:19,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-29 00:45:19,888 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:19,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:19,894 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:19,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:19,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:19,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:19,909 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:19,909 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-29 00:45:20,299 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-29 00:45:20,299 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-29 00:45:20,304 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:20,304 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:20,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:20,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-29 00:45:20,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:20,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-29 00:45:20,330 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:20,333 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-29 00:45:20,333 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-29 00:45:20,333 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-29 00:45:20,333 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-29 00:45:20,333 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-29 00:45:20,333 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-29 00:45:20,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:20,500 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:20,542 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:20,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:20,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:20,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:20,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03f34f0> has no local changes
2024-04-29 00:45:20,607 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:20,617 [ scc.git] DEBUG [detached HEAD 9fdf31e] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:20,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:20,617 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:21,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-29 00:45:21,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-29 00:45:22,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-29 00:45:22,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-29 00:45:22,999 [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-04-29 00:45:23,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-29 00:45:23,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:23,914 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-29 00:45:24,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-29 00:45:24,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-29 00:45:25,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-29 00:45:25,841 [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-04-29 00:45:26,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-29 00:45:26,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:26,766 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-29 00:45:26,767 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:26,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-29 00:45:26,767 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:26,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:26,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:26,777 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:26,777 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:26,782 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:26,787 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:26,787 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-29 00:45:27,292 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-29 00:45:27,292 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-29 00:45:27,298 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-29 00:45:27,868 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-29 00:45:27,868 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-29 00:45:27,873 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:27,874 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:27,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:27,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-29 00:45:27,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:27,891 [ 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-04-29 00:45:27,936 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-29 00:45:27,937 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-29 00:45:27,937 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-29 00:45:27,937 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-29 00:45:27,937 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:45:27,938 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:45:27,945 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-29 00:45:27,955 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-29 00:45:28,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:28,109 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-29 00:45:28,118 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-29 00:45:28,126 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-29 00:45:28,132 [ scc.config] DEBUG Found github.token
2024-04-29 00:45:28,132 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-29 00:45:28,133 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-29 00:45:28,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:28,144 [ 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-04-29 00:45:28,170 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-29 00:45:28,170 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-29 00:45:28,170 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-29 00:45:28,170 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:45:28,171 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:45:28,177 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-29 00:45:28,186 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-29 00:45:28,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:28,517 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-29 00:45:28,525 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-29 00:45:28,532 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/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-04-29 00:45:28,537 [ scc.config] DEBUG Found github.token
2024-04-29 00:45:28,537 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-29 00:45:28,537 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:28,577 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:28,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:28,583 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:28,621 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:28,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03d6550> has no local changes
2024-04-29 00:45:28,629 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:28,639 [ scc.git] DEBUG [detached HEAD dda4b6e] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:28,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:28,640 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:29,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-29 00:45:29,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-29 00:45:29,598 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-29 00:45:30,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-29 00:45:30,638 [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-04-29 00:45:31,195 [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-04-29 00:45:31,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-29 00:45:32,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:32,170 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-29 00:45:32,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-29 00:45:32,638 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-29 00:45:33,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-29 00:45:33,640 [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-04-29 00:45:34,117 [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-04-29 00:45:34,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-29 00:45:35,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:35,153 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-29 00:45:35,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-29 00:45:35,613 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-29 00:45:36,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-29 00:45:36,668 [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-04-29 00:45:37,164 [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-04-29 00:45:37,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-29 00:45:38,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:38,078 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-29 00:45:38,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-29 00:45:39,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-29 00:45:39,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-29 00:45:39,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-29 00:45:40,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-29 00:45:40,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-29 00:45:40,975 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:40,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-29 00:45:40,975 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:40,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:40,982 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:40,986 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:40,987 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:40,991 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:40,996 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:40,996 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-29 00:45:41,437 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-29 00:45:41,438 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-29 00:45:41,443 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-29 00:45:41,833 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-29 00:45:41,833 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-29 00:45:41,838 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-29 00:45:42,203 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-29 00:45:42,203 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-29 00:45:42,208 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:42,209 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:42,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:42,216 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-29 00:45:42,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:42,228 [ 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-04-29 00:45:42,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:42,241 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-29 00:45:42,241 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-29 00:45:42,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:42,407 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-29 00:45:42,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:42,424 [ 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-04-29 00:45:42,472 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-29 00:45:42,486 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:42,490 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-29 00:45:42,491 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-29 00:45:42,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:42,821 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-29 00:45:42,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:42,835 [ 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-04-29 00:45:42,866 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-29 00:45:42,867 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:42,871 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-29 00:45:42,871 [ scc.git] DEBUG package.json | 2 +-
2024-04-29 00:45:42,871 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-29 00:45:43,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:43,231 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:43,271 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:43,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:43,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:43,320 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:43,328 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0402fd0> has no local changes
2024-04-29 00:45:43,328 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:43,336 [ scc.git] DEBUG [detached HEAD 8835dbf] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:43,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:43,337 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:43,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-29 00:45:44,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-29 00:45:44,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-29 00:45:45,150 [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-04-29 00:45:45,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-29 00:45:46,015 [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-04-29 00:45:46,016 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-29 00:45:46,017 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:46,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-29 00:45:46,017 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:46,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:46,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:46,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:46,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:46,034 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:46,039 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:46,039 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-29 00:45:46,410 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-29 00:45:46,410 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-29 00:45:46,416 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:46,416 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:46,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:46,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-29 00:45:46,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:46,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-29 00:45:46,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:46,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:46,608 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:46,648 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:46,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:46,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:46,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:46,696 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0369340> has no local changes
2024-04-29 00:45:46,696 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:46,704 [ scc.git] DEBUG [detached HEAD bac6cdb] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:46,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:46,704 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:47,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-29 00:45:47,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-29 00:45:48,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-29 00:45:48,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-29 00:45:49,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-29 00:45:49,547 [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-04-29 00:45:50,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-29 00:45:50,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:50,468 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-29 00:45:50,469 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:50,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-29 00:45:50,469 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:50,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:50,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:50,481 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:50,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:50,486 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:50,493 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:50,494 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-29 00:45:50,958 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-29 00:45:50,958 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-29 00:45:50,963 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:50,964 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:50,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:50,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-29 00:45:50,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:50,982 [ 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-04-29 00:45:50,991 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-29 00:45:50,991 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:50,993 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-29 00:45:50,993 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-29 00:45:51,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:51,153 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:51,191 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:51,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:51,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:51,233 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:51,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03ab5b0> has no local changes
2024-04-29 00:45:51,239 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:51,247 [ scc.git] DEBUG [detached HEAD 174c0cb] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:51,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:51,248 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:51,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-29 00:45:52,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-29 00:45:52,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-29 00:45:53,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-29 00:45:53,520 [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-04-29 00:45:54,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-29 00:45:54,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:45:54,472 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-29 00:45:54,472 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:54,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-29 00:45:54,472 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:54,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:54,479 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:54,484 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:54,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:54,489 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:54,494 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:54,495 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-29 00:45:54,899 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-29 00:45:54,900 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-29 00:45:54,907 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:54,907 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:54,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:54,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-29 00:45:54,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:54,927 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-29 00:45:54,960 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-29 00:45:54,960 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG Auto-merging setup.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-29 00:45:54,961 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:45:54,961 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:45:54,969 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-29 00:45:54,976 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-29 00:45:55,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:55,140 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-29 00:45:55,148 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-29 00:45:55,155 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-04-29 00:45:55,161 [ scc.config] DEBUG Found github.token
2024-04-29 00:45:55,162 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-29 00:45:55,162 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:55,201 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:55,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:55,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:55,247 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:55,256 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0400df0> has no local changes
2024-04-29 00:45:55,256 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:55,268 [ scc.git] DEBUG [detached HEAD d9c1bdf] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:55,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:55,268 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:55,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-29 00:45:56,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-29 00:45:56,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-29 00:45:57,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-29 00:45:57,558 [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-04-29 00:45:57,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-29 00:45:58,411 [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-04-29 00:45:58,412 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-29 00:45:58,412 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:58,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-29 00:45:58,412 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:58,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:58,431 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:58,442 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:58,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:58,456 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:58,462 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:58,462 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-29 00:45:58,912 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-29 00:45:58,912 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-29 00:45:58,917 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:58,917 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:58,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:58,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-29 00:45:58,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:58,934 [ 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-04-29 00:45:58,965 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:45:58,968 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-29 00:45:58,969 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-29 00:45:58,969 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-29 00:45:58,970 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-29 00:45:58,971 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-29 00:45:58,971 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-29 00:45:58,971 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-29 00:45:58,971 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-29 00:45:58,971 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-29 00:45:58,972 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-29 00:45:58,972 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-29 00:45:58,973 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-29 00:45:58,974 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-29 00:45:59,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:45:59,149 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:59,192 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:59,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:59,199 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:59,242 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:59,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0402df0> has no local changes
2024-04-29 00:45:59,251 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:59,278 [ scc.git] DEBUG [detached HEAD f648242] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:59,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:59,279 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:45:59,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-29 00:45:59,574 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:45:59,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-29 00:45:59,575 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:59,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:59,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:45:59,585 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:45:59,586 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:45:59,591 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:45:59,596 [ scc.git] DEBUG Already up to date.
2024-04-29 00:45:59,597 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:45:59,597 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:59,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:59,602 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:45:59,643 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:45:59,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:45:59,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:45:59,693 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:45:59,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da03bdfa0> has no local changes
2024-04-29 00:45:59,700 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:45:59,710 [ scc.git] DEBUG [detached HEAD 8e429ca] merge master -Dorg -Ssuccess-only
2024-04-29 00:45:59,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:45:59,711 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:00,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-29 00:46:00,016 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:00,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-29 00:46:00,016 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:00,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:00,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:46:00,029 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:00,029 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:46:00,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:46:00,041 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:00,041 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:00,041 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:00,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:00,046 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:00,085 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:00,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:00,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:00,136 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:00,143 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da034df70> has no local changes
2024-04-29 00:46:00,143 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:00,151 [ scc.git] DEBUG [detached HEAD f219ecf] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:00,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:00,151 [ scc.git] INFO Overriding base-branch from master to main
2024-04-29 00:46:00,151 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:00,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-29 00:46:00,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-29 00:46:01,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-29 00:46:01,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-29 00:46:02,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-29 00:46:02,888 [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-04-29 00:46:03,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:46:03,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-29 00:46:04,294 [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-04-29 00:46:04,295 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-29 00:46:04,296 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:04,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-29 00:46:04,296 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:04,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:04,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-29 00:46:04,308 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:04,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-29 00:46:04,314 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-29 00:46:04,319 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:04,319 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-29 00:46:04,716 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-29 00:46:04,716 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-29 00:46:04,721 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:04,721 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:04,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:04,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-29 00:46:04,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:04,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-29 00:46:04,759 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-29 00:46:04,759 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-29 00:46:04,760 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:46:04,760 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:46:04,767 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-29 00:46:04,774 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-29 00:46:04,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:04,935 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-29 00:46:04,944 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-29 00:46:04,951 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-29 00:46:04,957 [ scc.config] DEBUG Found github.token
2024-04-29 00:46:04,957 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-29 00:46:04,957 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:04,996 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:04,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:05,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:05,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0342430> has no local changes
2024-04-29 00:46:05,052 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:05,061 [ scc.git] DEBUG [detached HEAD 1e776f2] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:05,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:05,062 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:05,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-29 00:46:05,366 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:05,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-29 00:46:05,366 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,373 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:46:05,378 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:05,378 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:46:05,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:46:05,389 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:05,389 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:05,389 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,394 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:05,432 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:05,475 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:05,482 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da0352e50> has no local changes
2024-04-29 00:46:05,482 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:05,490 [ scc.git] DEBUG [detached HEAD ea3238d] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:05,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:05,491 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:05,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-29 00:46:05,809 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:05,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-29 00:46:05,809 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,817 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:46:05,824 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:05,824 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:46:05,829 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:46:05,836 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:05,836 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:05,836 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,842 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:05,883 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:05,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:05,889 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:05,932 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:05,939 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da028a940> has no local changes
2024-04-29 00:46:05,939 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:05,948 [ scc.git] DEBUG [detached HEAD 48f4028] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:05,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:05,948 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:06,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-29 00:46:06,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-29 00:46:07,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-29 00:46:07,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-29 00:46:08,218 [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-04-29 00:46:08,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-29 00:46:09,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:46:09,102 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-29 00:46:09,103 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:09,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-29 00:46:09,103 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:09,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:09,111 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:46:09,117 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:09,118 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:46:09,125 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:46:09,132 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:09,133 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-29 00:46:09,560 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-29 00:46:09,561 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-29 00:46:09,572 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:09,573 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:09,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:09,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-29 00:46:09,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:09,600 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-29 00:46:09,637 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-29 00:46:09,638 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-29 00:46:09,638 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:46:09,639 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:46:09,646 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-29 00:46:09,654 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-29 00:46:09,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:09,825 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-29 00:46:09,832 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-29 00:46:09,838 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-29 00:46:09,842 [ scc.config] DEBUG Found github.token
2024-04-29 00:46:09,843 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-29 00:46:09,843 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:09,882 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:09,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:09,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:09,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:09,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da02ef310> has no local changes
2024-04-29 00:46:09,936 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:09,945 [ scc.git] DEBUG [detached HEAD c62c339] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:09,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:09,946 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-29 00:46:09,946 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:46:10,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-29 00:46:10,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-29 00:46:11,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-29 00:46:11,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-29 00:46:12,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-29 00:46:12,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-29 00:46:13,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-29 00:46:13,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-29 00:46:14,222 [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-04-29 00:46:14,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-29 00:46:15,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:46:15,077 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-29 00:46:15,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-29 00:46:16,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-29 00:46:16,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-29 00:46:17,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-29 00:46:17,057 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:46:17,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-29 00:46:17,058 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:17,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:17,066 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-29 00:46:17,072 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:46:17,072 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-29 00:46:17,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-29 00:46:17,086 [ scc.git] DEBUG Already up to date.
2024-04-29 00:46:17,087 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-29 00:46:17,525 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-29 00:46:17,525 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-29 00:46:17,530 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:46:17,530 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:17,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:17,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-29 00:46:17,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:17,552 [ 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-04-29 00:46:17,612 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-29 00:46:17,612 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-29 00:46:17,612 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:46:17,613 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:46:17,623 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-29 00:46:17,634 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-29 00:46:17,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:17,808 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-29 00:46:17,818 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-29 00:46:17,824 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-29 00:46:17,829 [ scc.config] DEBUG Found github.token
2024-04-29 00:46:17,829 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-29 00:46:17,830 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:46:17,875 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:46:17,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:46:17,881 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:17,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:17,927 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da028abb0> has no local changes
2024-04-29 00:46:17,927 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:17,936 [ scc.git] DEBUG [detached HEAD f6a39b3] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:17,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:17,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:46:18,019 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-29 00:46:18,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:18,255 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-29 00:46:18,264 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-29 00:46:18,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:18,665 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-29 00:46:18,670 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-29 00:46:19,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:19,073 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-29 00:46:19,078 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-29 00:46:19,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:19,483 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-29 00:46:19,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:19,883 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-29 00:46:19,890 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-29 00:46:20,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:20,294 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-29 00:46:20,300 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-29 00:46:20,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:20,763 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-29 00:46:20,767 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-29 00:46:21,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:21,181 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-29 00:46:21,187 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-29 00:46:21,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:21,597 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-29 00:46:21,603 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-29 00:46:21,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:22,000 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-29 00:46:22,006 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-29 00:46:22,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:22,414 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-29 00:46:22,420 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-29 00:46:22,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:22,834 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-29 00:46:22,839 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-29 00:46:23,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:23,241 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-29 00:46:23,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:23,664 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-29 00:46:24,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:24,072 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-29 00:46:24,077 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-29 00:46:24,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:24,494 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-29 00:46:24,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:24,902 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-29 00:46:25,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:25,314 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-29 00:46:25,321 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-29 00:46:25,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:25,731 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-29 00:46:25,735 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-29 00:46:26,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:26,158 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-29 00:46:26,163 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-29 00:46:26,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:26,600 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-29 00:46:26,606 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-29 00:46:27,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:46:27,028 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-29 00:46:27,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:46:27,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3da1585ac0> has local changes
2024-04-29 00:46:27,144 [ 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 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
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 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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 543 will-moore 'Plate well labels' (stage: draft)
Updating 87d179a0..e5a45d60
Previously merged:
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Conflicting PRs (not included):
- PR 549 will-moore 'Inset feature'
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 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/46/)'
2024-04-29 00:46:27,160 [ scc.git] DEBUG [detached HEAD 89bbf7c] merge master -Dorg -Ssuccess-only
2024-04-29 00:46:27,161 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-29 00:46:27,161 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-29 00:46:27,161 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,161 [ scc.merge] INFO
2024-04-29 00:46:27,161 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,161 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-29 00:46:27,161 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-29 00:46:27,161 [ scc.merge] INFO
2024-04-29 00:46:27,161 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-29 00:46:27,161 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,161 [ scc.merge] INFO
2024-04-29 00:46:27,161 [ scc.merge] INFO
2024-04-29 00:46:27,161 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-29 00:46:27,161 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,161 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-29 00:46:27,161 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,161 [ scc.merge] INFO
2024-04-29 00:46:27,161 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-29 00:46:27,162 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-29 00:46:27,162 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-29 00:46:27,162 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-29 00:46:27,162 [ scc.merge] INFO Updating 87d179a0..e5a45d60
2024-04-29 00:46:27,162 [ scc.merge] INFO Previously merged:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-29 00:46:27,162 [ scc.merge] INFO
2024-04-29 00:46:27,162 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-29 00:46:27,162 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-29 00:46:27,163 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-29 00:46:27,163 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-29 00:46:27,163 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-29 00:46:27,163 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-29 00:46:27,163 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,163 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-29 00:46:27,163 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,163 [ scc.merge] INFO
2024-04-29 00:46:27,163 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-29 00:46:27,164 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-29 00:46:27,164 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-29 00:46:27,164 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-29 00:46:27,164 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-29 00:46:27,164 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-29 00:46:27,164 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,164 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-29 00:46:27,164 [ scc.merge] INFO
2024-04-29 00:46:27,164 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-29 00:46:27,164 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,165 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Merged PRs:
2024-04-29 00:46:27,165 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-29 00:46:27,165 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,165 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,165 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,165 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-29 00:46:27,165 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,165 [ scc.merge] INFO
2024-04-29 00:46:27,166 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-29 00:46:27,166 [ scc.merge] INFO
2024-04-29 00:46:27,166 [ scc.merge] INFO Repository: ome/scripts
2024-04-29 00:46:27,166 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-29 00:46:27,166 [ scc.merge] INFO Already up to date.
2024-04-29 00:46:27,166 [ scc.merge] INFO
2024-04-29 00:46:27,166 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:46:27,166 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-29 00:46:27,166 [ scc.merge] INFO
2024-04-29 00:46:27,166 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-29 00:46:27,166 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-29 00:46:27,173 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-29 00:46:27,179 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-29 00:46:27,186 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-29 00:46:27,192 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-29 00:46:27,197 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-29 00:46:27,204 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-29 00:46:27,211 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-29 00:46:27,216 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-29 00:46:27,220 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-29 00:46:27,227 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-29 00:46:27,233 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-29 00:46:27,239 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-29 00:46:27,245 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-29 00:46:27,252 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-29 00:46:27,258 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-29 00:46:27,262 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-29 00:46:27,267 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-29 00:46:27,272 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-29 00:46:27,277 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-29 00:46:27,281 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-29 00:46:27,287 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-29 00:46:27,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-29 00:46:27,292 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:46:27,298 [ 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.8.2 to 5.9.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD ceaf148] 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 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
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 87d179a0
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 9d8d147
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 a0148a6
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 5a90893
nothing to commit, working tree clean
[detached HEAD 4f74672] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-29 00:47:15,339 [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-04-29 00:47:24,314 [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-04-29 00:47:26,676 [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-04-29 00:47:31,280 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-29 00:48:17,820 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
