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-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-27 00:44:44,159 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-27 00:44:44,160 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-27 00:44:44,160 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-27 00:44:44,160 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-27 00:44:44,160 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-27 00:44:44,160 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-27 00:44:44,160 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-27 00:44:44,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:44,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54'
2024-04-27 00:44:44,365 [ scc.git] ERROR stderr (git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54): warning: HEAD...05cb9d985242252c32324050a4895e2c03203f54: multiple merge bases, using 852b5109c4c0503d2740da64714512e83c619db0
2024-04-27 00:44:44,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:44,373 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 05cb9d985242252c32324050a4895e2c03203f54'
2024-04-27 00:44:44,438 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-04-27 00:44:44,438 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-04-27 00:44:44,438 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/views/right_panel_view.js
2024-04-27 00:44:44,438 [ scc.git] DEBUG Auto-merging src/js/views/util.js
2024-04-27 00:44:44,438 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:44:44,439 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:44:44,451 [ scc.git] DEBUG Calling 'git reset --hard 9ccf74434400146530691321611b7d21fe56104f'
2024-04-27 00:44:44,467 [ scc.git] DEBUG HEAD is now at 9ccf7443 merge master -Dorg -Ssuccess-only: PR 477 (Vite)
2024-04-27 00:44:44,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:44,712 [ scc.git] DEBUG Calling 'git merge-base e5a45d6081c9064d2b676a4b772ab399ae2b7f02 05cb9d985242252c32324050a4895e2c03203f54'
2024-04-27 00:44:44,723 [ scc.git] DEBUG Calling 'git diff --name-only 852b5109c4c0503d2740da64714512e83c619db0..e5a45d6081c9064d2b676a4b772ab399ae2b7f02'
2024-04-27 00:44:44,731 [ scc.git] INFO - PR 549 will-moore 'Inset feature'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- PR #477 will-moore 'Vite'
- src/js/views/right_panel_view.js
--conflicts
2024-04-27 00:44:44,736 [ scc.config] DEBUG Found github.token
2024-04-27 00:44:44,737 [ scc.git] DEBUG Adding comment to issue #549.
2024-04-27 00:44:45,494 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/549/comments HTTP/1.1" 201 1977
2024-04-27 00:44:45,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-27 00:44:45,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:45,511 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-27 00:44:45,592 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:44:45,596 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-27 00:44:45,596 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-27 00:44:45,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:45,899 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-27 00:44:45,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:45,915 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-27 00:44:45,933 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:44:45,938 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-04-27 00:44:45,938 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-04-27 00:44:45,938 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-04-27 00:44:45,938 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 479 ++++++++++++++++++++++-
2024-04-27 00:44:45,938 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-04-27 00:44:45,939 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-04-27 00:44:45,939 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-04-27 00:44:45,939 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-04-27 00:44:45,939 [ scc.git] DEBUG 8 files changed, 501 insertions(+), 7 deletions(-)
2024-04-27 00:44:45,939 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-04-27 00:44:46,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:46,294 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:44:46,341 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:46,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:46,350 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:44:46,397 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:44:46,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4875ebe0> has no local changes
2024-04-27 00:44:46,465 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:44:46,477 [ scc.git] DEBUG [detached HEAD 3eff9c53] merge master -Dorg -Ssuccess-only
2024-04-27 00:44:46,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:44:46,478 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:44:46,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-27 00:44:47,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-27 00:44:47,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-27 00:44:48,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-27 00:44:48,626 [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-27 00:44:49,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-27 00:44:49,557 [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-27 00:44:49,558 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-27 00:44:49,558 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:44:49,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-27 00:44:49,558 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:49,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:49,576 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:44:49,585 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:44:49,585 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:44:49,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:44:49,604 [ scc.git] DEBUG Already up to date.
2024-04-27 00:44:49,604 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-27 00:44:49,983 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-27 00:44:49,983 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-27 00:44:49,989 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:44:49,989 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:49,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:49,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-27 00:44:50,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:50,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-27 00:44:50,051 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-27 00:44:50,051 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:44:50,054 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-27 00:44:50,054 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-27 00:44:50,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:50,219 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:44:50,265 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:50,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:50,271 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:44:50,313 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:44:50,321 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4872c550> has no local changes
2024-04-27 00:44:50,321 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:44:50,333 [ scc.git] DEBUG [detached HEAD 5245cf1] merge master -Dorg -Ssuccess-only
2024-04-27 00:44:50,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:44:50,334 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:44:50,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-27 00:44:51,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-27 00:44:51,135 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-27 00:44:51,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-27 00:44:52,202 [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-27 00:44:52,693 [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-27 00:44:53,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-27 00:44:53,641 [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-27 00:44:53,642 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-27 00:44:53,642 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:44:53,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-27 00:44:53,642 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:53,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:53,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:44:53,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:44:53,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:44:53,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:44:53,668 [ scc.git] DEBUG Already up to date.
2024-04-27 00:44:53,668 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-27 00:44:54,063 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-27 00:44:54,064 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-27 00:44:54,070 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:44:54,070 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:54,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:54,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-27 00:44:54,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:54,090 [ 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-27 00:44:54,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:44:54,108 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-27 00:44:54,108 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-27 00:44:54,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:44:54,264 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:44:54,309 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:44:54,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:44:54,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:44:54,370 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:44:54,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca48734820> has no local changes
2024-04-27 00:44:54,381 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:44:54,393 [ scc.git] DEBUG [detached HEAD 9541683] merge master -Dorg -Ssuccess-only
2024-04-27 00:44:54,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:44:54,393 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:44:54,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-27 00:44:55,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-27 00:44:55,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-04-27 00:44:56,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-27 00:44:56,730 [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-27 00:44:57,195 [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-27 00:44:57,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-27 00:44:58,092 [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-27 00:44:58,093 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-27 00:44:58,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-27 00:44:58,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-27 00:44:59,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-27 00:44:59,950 [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-27 00:45:00,408 [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-27 00:45:00,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-27 00:45:01,252 [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-27 00:45:01,252 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-27 00:45:01,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-27 00:45:02,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-27 00:45:02,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-27 00:45:03,195 [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-27 00:45:03,672 [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-27 00:45:04,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-27 00:45:04,627 [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-27 00:45:04,628 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-27 00:45:05,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-27 00:45:05,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-27 00:45:06,183 [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-27 00:45:06,680 [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-27 00:45:07,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-27 00:45:07,583 [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-27 00:45:07,584 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-27 00:45:08,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-27 00:45:08,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-27 00:45:09,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-27 00:45:09,490 [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-27 00:45:09,975 [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-27 00:45:10,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-27 00:45:10,810 [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-27 00:45:10,811 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-27 00:45:11,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-27 00:45:11,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-27 00:45:12,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-27 00:45:12,683 [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-27 00:45:13,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-27 00:45:13,620 [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-27 00:45:13,621 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-27 00:45:13,621 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:13,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-27 00:45:13,622 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:13,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:13,629 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:13,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:13,636 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:13,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:13,651 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:13,651 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-27 00:45:14,129 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:14,130 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-27 00:45:14,135 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-27 00:45:15,005 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:15,005 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-27 00:45:15,010 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-27 00:45:15,414 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:15,414 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-27 00:45:15,419 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-27 00:45:16,229 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:16,229 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-27 00:45:16,235 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-27 00:45:16,651 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:16,651 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-27 00:45:16,656 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-27 00:45:17,187 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-27 00:45:17,187 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-27 00:45:17,193 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:17,194 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:17,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:17,201 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-27 00:45:17,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:17,218 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-27 00:45:17,245 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:17,249 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-27 00:45:17,249 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-27 00:45:17,249 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-27 00:45:17,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:17,413 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-27 00:45:17,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:17,426 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-27 00:45:17,507 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:17,513 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-27 00:45:17,513 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-27 00:45:17,513 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-27 00:45:17,514 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-27 00:45:17,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:17,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-27 00:45:17,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:17,830 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-27 00:45:17,855 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:17,857 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-27 00:45:17,857 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-27 00:45:18,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:18,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-27 00:45:18,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:18,227 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-27 00:45:18,343 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-27 00:45:18,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:18,350 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-27 00:45:18,350 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-27 00:45:18,350 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-27 00:45:18,350 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-27 00:45:18,351 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-27 00:45:18,351 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-27 00:45:18,351 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-27 00:45:18,351 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-27 00:45:18,351 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-27 00:45:18,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:18,614 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-27 00:45:18,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:18,631 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-27 00:45:18,697 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-27 00:45:18,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:18,701 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-27 00:45:18,701 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-27 00:45:18,701 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-27 00:45:19,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:19,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-27 00:45:19,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:19,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-27 00:45:19,114 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-27 00:45:19,114 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-27 00:45:19,114 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-27 00:45:19,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:19,120 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-27 00:45:19,120 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 11 ++++++-----
2024-04-27 00:45:19,120 [ scc.git] DEBUG src/model/image_info.js | 41 +++++++++++++++++++++++++++++++++++++++++
2024-04-27 00:45:19,120 [ scc.git] DEBUG 3 files changed, 51 insertions(+), 5 deletions(-)
2024-04-27 00:45:19,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:19,422 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:19,466 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:19,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:19,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:19,524 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:19,534 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4870d5b0> has no local changes
2024-04-27 00:45:19,535 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:19,555 [ scc.git] DEBUG [detached HEAD c33bf5a] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:19,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:19,556 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:19,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-27 00:45:20,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-27 00:45:20,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-27 00:45:21,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-27 00:45:21,898 [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-27 00:45:22,379 [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-27 00:45:22,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-27 00:45:23,272 [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-27 00:45:23,272 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-27 00:45:23,272 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:23,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-27 00:45:23,273 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:23,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:23,278 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:23,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:23,283 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:23,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:23,294 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:23,294 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-27 00:45:23,678 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-27 00:45:23,678 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-27 00:45:23,684 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:23,684 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:23,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:23,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-27 00:45:23,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:23,701 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-27 00:45:23,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:23,715 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-27 00:45:23,715 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-27 00:45:23,715 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-27 00:45:23,715 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-27 00:45:23,715 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-27 00:45:23,715 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-27 00:45:23,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:23,874 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:23,916 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:23,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:23,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:23,959 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:23,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca486fe4f0> has no local changes
2024-04-27 00:45:23,966 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:23,976 [ scc.git] DEBUG [detached HEAD d405f0e] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:23,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:23,977 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:24,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-27 00:45:24,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-27 00:45:25,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-27 00:45:25,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-27 00:45:26,365 [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-27 00:45:26,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-27 00:45:27,294 [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-27 00:45:27,295 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-27 00:45:27,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-27 00:45:28,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-27 00:45:28,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-27 00:45:29,163 [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-27 00:45:29,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-27 00:45:30,043 [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-27 00:45:30,043 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-27 00:45:30,044 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:30,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-27 00:45:30,044 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:30,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:30,051 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:30,056 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:30,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:30,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:30,079 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:30,080 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-27 00:45:30,578 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-27 00:45:30,579 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-27 00:45:30,583 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-27 00:45:31,109 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-27 00:45:31,109 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-27 00:45:31,114 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:31,114 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:31,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:31,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-27 00:45:31,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:31,131 [ 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-27 00:45:31,173 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-27 00:45:31,173 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-27 00:45:31,173 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-27 00:45:31,174 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-27 00:45:31,174 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:45:31,174 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:45:31,180 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-27 00:45:31,186 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-27 00:45:31,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:31,382 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-27 00:45:31,390 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-27 00:45:31,398 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-27 00:45:31,404 [ scc.config] DEBUG Found github.token
2024-04-27 00:45:31,405 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-27 00:45:31,405 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-27 00:45:31,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:31,423 [ 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-27 00:45:31,447 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-27 00:45:31,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-27 00:45:31,448 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-27 00:45:31,448 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:45:31,448 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:45:31,456 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-27 00:45:31,465 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-27 00:45:31,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:31,813 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-27 00:45:31,821 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-27 00:45:31,828 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/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-27 00:45:31,835 [ scc.config] DEBUG Found github.token
2024-04-27 00:45:31,835 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-27 00:45:31,835 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:31,874 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:31,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:31,880 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:31,919 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:31,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4870d550> has no local changes
2024-04-27 00:45:31,929 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:31,939 [ scc.git] DEBUG [detached HEAD 0ef5d2b] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:31,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:31,940 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:32,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-27 00:45:32,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-27 00:45:32,888 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-27 00:45:33,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-27 00:45:34,452 [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-27 00:45:35,000 [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-27 00:45:35,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-27 00:45:35,924 [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-27 00:45:35,925 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-27 00:45:36,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-27 00:45:36,389 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-27 00:45:36,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-27 00:45:37,403 [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-27 00:45:37,868 [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-27 00:45:38,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-27 00:45:38,722 [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-27 00:45:38,723 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-27 00:45:39,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-27 00:45:39,208 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-27 00:45:39,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-27 00:45:40,303 [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-27 00:45:40,775 [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-27 00:45:42,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-27 00:45:42,587 [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-27 00:45:42,588 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-27 00:45:43,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-27 00:45:43,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-27 00:45:44,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-27 00:45:44,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-27 00:45:44,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-27 00:45:45,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-27 00:45:45,439 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:45,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-27 00:45:45,439 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:45,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:45,444 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:45,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:45,449 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:45,454 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:45,460 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:45,460 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-27 00:45:45,849 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-27 00:45:45,850 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-27 00:45:45,855 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-27 00:45:46,224 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-27 00:45:46,224 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-27 00:45:46,228 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-27 00:45:46,582 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-27 00:45:46,583 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-27 00:45:46,587 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:46,587 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:46,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:46,593 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-27 00:45:46,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:46,605 [ 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-27 00:45:46,627 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:46,630 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-27 00:45:46,631 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-27 00:45:46,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:46,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-27 00:45:46,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:46,802 [ 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-27 00:45:46,830 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-27 00:45:46,830 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:46,833 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-27 00:45:46,833 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-27 00:45:47,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:47,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-27 00:45:47,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:47,212 [ 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-27 00:45:47,232 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-27 00:45:47,233 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:47,237 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-27 00:45:47,237 [ scc.git] DEBUG package.json | 2 +-
2024-04-27 00:45:47,237 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-27 00:45:47,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:47,610 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:47,647 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:47,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:47,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:47,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:47,698 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4870bfd0> has no local changes
2024-04-27 00:45:47,699 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:47,707 [ scc.git] DEBUG [detached HEAD 5a83a53] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:47,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:47,707 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:48,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-27 00:45:48,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-27 00:45:49,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-27 00:45:49,584 [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-27 00:45:50,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-27 00:45:50,551 [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-27 00:45:50,552 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-27 00:45:50,552 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:50,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-27 00:45:50,552 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:50,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:50,558 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:50,563 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:50,564 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:50,569 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:50,574 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:50,575 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-27 00:45:50,999 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-27 00:45:50,999 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-27 00:45:51,004 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:51,004 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:51,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:51,010 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-27 00:45:51,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:51,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-27 00:45:51,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:51,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:51,185 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:51,224 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:51,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:51,233 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:51,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:51,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4869e340> has no local changes
2024-04-27 00:45:51,288 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:51,296 [ scc.git] DEBUG [detached HEAD 58ad577] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:51,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:51,296 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:51,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-27 00:45:52,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-27 00:45:52,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-27 00:45:53,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-27 00:45:53,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-27 00:45:54,091 [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-27 00:45:54,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-27 00:45:54,968 [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-27 00:45:54,969 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-27 00:45:54,969 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:54,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-27 00:45:54,969 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:54,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:54,975 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:54,981 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:54,981 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:54,986 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:54,992 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:54,992 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-27 00:45:55,461 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-27 00:45:55,462 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-27 00:45:55,467 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:55,467 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:55,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:55,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-27 00:45:55,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:55,487 [ 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-27 00:45:55,497 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-27 00:45:55,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:45:55,500 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-27 00:45:55,500 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-27 00:45:55,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:55,660 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:55,700 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:55,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:55,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:55,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:55,757 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca486f25b0> has no local changes
2024-04-27 00:45:55,757 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:55,765 [ scc.git] DEBUG [detached HEAD 295e453] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:55,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:55,765 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:45:56,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-27 00:45:56,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-27 00:45:57,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-27 00:45:57,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-27 00:45:58,108 [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-27 00:45:58,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-27 00:45:59,075 [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-27 00:45:59,075 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-27 00:45:59,075 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:45:59,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-27 00:45:59,076 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:59,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:59,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:45:59,087 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:45:59,087 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:45:59,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:45:59,097 [ scc.git] DEBUG Already up to date.
2024-04-27 00:45:59,097 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-27 00:45:59,493 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-27 00:45:59,493 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-27 00:45:59,498 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:45:59,498 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:59,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:59,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-27 00:45:59,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:59,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-27 00:45:59,546 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG Auto-merging setup.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-27 00:45:59,546 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:45:59,546 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:45:59,553 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-27 00:45:59,560 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-27 00:45:59,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:45:59,728 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-27 00:45:59,734 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-27 00:45:59,739 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-04-27 00:45:59,745 [ scc.config] DEBUG Found github.token
2024-04-27 00:45:59,745 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-27 00:45:59,745 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:45:59,794 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:45:59,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:45:59,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:45:59,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:45:59,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca48734df0> has no local changes
2024-04-27 00:45:59,845 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:45:59,854 [ scc.git] DEBUG [detached HEAD ad92cdc] merge master -Dorg -Ssuccess-only
2024-04-27 00:45:59,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:45:59,854 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:00,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-27 00:46:00,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-27 00:46:01,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-27 00:46:01,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-27 00:46:02,109 [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-27 00:46:02,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-27 00:46:03,062 [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-27 00:46:03,063 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-27 00:46:03,063 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:03,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-27 00:46:03,063 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:03,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:03,068 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:03,073 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:03,074 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:03,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:03,084 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:03,084 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-27 00:46:03,522 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-27 00:46:03,522 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-27 00:46:03,527 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:03,527 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:03,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:03,532 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-27 00:46:03,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:03,545 [ 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-27 00:46:03,565 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-27 00:46:03,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-27 00:46:03,570 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-27 00:46:03,570 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-27 00:46:03,570 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-27 00:46:03,571 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-27 00:46:03,571 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-27 00:46:03,571 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-27 00:46:03,571 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-27 00:46:03,571 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-27 00:46:03,571 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-27 00:46:03,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:03,721 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:03,768 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:03,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:03,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:03,819 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:03,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4870bdf0> has no local changes
2024-04-27 00:46:03,827 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:03,837 [ scc.git] DEBUG [detached HEAD 29513b4] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:03,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:03,838 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:04,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-27 00:46:04,145 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:04,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-27 00:46:04,145 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:04,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:04,157 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:04,164 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:04,171 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:04,172 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:04,172 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,177 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:04,220 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,226 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:04,268 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:04,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca486c8fa0> has no local changes
2024-04-27 00:46:04,275 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:04,284 [ scc.git] DEBUG [detached HEAD bcb0925] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:04,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:04,285 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:04,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-27 00:46:04,577 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:04,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-27 00:46:04,577 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:04,589 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:04,589 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:04,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:04,599 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:04,599 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:04,599 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,604 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:04,645 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:04,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:04,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:04,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:04,697 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4869cf70> has no local changes
2024-04-27 00:46:04,697 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:04,706 [ scc.git] DEBUG [detached HEAD 15e1060] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:04,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:04,707 [ scc.git] INFO Overriding base-branch from master to main
2024-04-27 00:46:04,707 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:05,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-27 00:46:05,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-27 00:46:06,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-27 00:46:06,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-27 00:46:06,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-27 00:46:07,476 [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-27 00:46:08,016 [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-27 00:46:08,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-27 00:46:08,910 [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-27 00:46:08,911 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-27 00:46:08,911 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:08,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-27 00:46:08,911 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:08,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:08,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-27 00:46:08,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:08,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-27 00:46:08,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-27 00:46:08,933 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:08,933 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-27 00:46:09,465 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-27 00:46:09,466 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-27 00:46:09,470 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:09,470 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:09,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:09,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-27 00:46:09,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:09,488 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-27 00:46:09,618 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-27 00:46:09,619 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-27 00:46:09,619 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:46:09,619 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:46:09,626 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-27 00:46:09,634 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-27 00:46:09,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:09,795 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-27 00:46:09,802 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-27 00:46:09,808 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-27 00:46:09,814 [ scc.config] DEBUG Found github.token
2024-04-27 00:46:09,815 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-27 00:46:09,815 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:09,858 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:09,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:09,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:09,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:09,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca4865c430> has no local changes
2024-04-27 00:46:09,914 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:09,923 [ scc.git] DEBUG [detached HEAD a6365e2] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:09,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:09,924 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:10,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-27 00:46:10,227 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:10,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-27 00:46:10,228 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:10,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:10,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:10,245 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:10,251 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:10,251 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:10,251 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,256 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:10,299 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:10,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:10,357 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca486a5e50> has no local changes
2024-04-27 00:46:10,357 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:10,366 [ scc.git] DEBUG [detached HEAD 92c6b7a] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:10,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:10,367 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:10,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-27 00:46:10,663 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:10,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-27 00:46:10,663 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:10,676 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:10,676 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:10,684 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:10,691 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:10,691 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:10,691 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,697 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:10,740 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:10,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:10,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:10,785 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:10,791 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca485bf940> has no local changes
2024-04-27 00:46:10,792 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:10,801 [ scc.git] DEBUG [detached HEAD 88f1681] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:10,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:10,802 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:11,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-27 00:46:11,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-27 00:46:12,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-27 00:46:12,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-27 00:46:13,030 [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-27 00:46:13,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-27 00:46:13,909 [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-27 00:46:13,910 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-27 00:46:13,910 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:13,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-27 00:46:13,910 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:13,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:13,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:46:13,922 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:13,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:46:13,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:46:13,935 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:13,935 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-27 00:46:14,502 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-27 00:46:14,503 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-27 00:46:14,507 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:14,508 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:14,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:14,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-27 00:46:14,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:14,528 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-27 00:46:14,575 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-27 00:46:14,576 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-27 00:46:14,576 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:46:14,576 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:46:14,584 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-27 00:46:14,591 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-27 00:46:14,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:14,752 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-27 00:46:14,758 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-27 00:46:14,764 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-27 00:46:14,769 [ scc.config] DEBUG Found github.token
2024-04-27 00:46:14,769 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-27 00:46:14,769 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:14,807 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:14,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:14,813 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:14,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:14,859 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca48613400> has no local changes
2024-04-27 00:46:14,860 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:14,871 [ scc.git] DEBUG [detached HEAD e1ab977] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:14,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:14,872 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-27 00:46:14,872 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:46:15,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-27 00:46:15,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-27 00:46:16,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-27 00:46:16,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-27 00:46:17,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-27 00:46:17,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-27 00:46:18,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-27 00:46:18,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-27 00:46:19,494 [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-27 00:46:19,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-27 00:46:20,332 [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-27 00:46:20,333 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-27 00:46:20,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-27 00:46:21,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-27 00:46:21,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-27 00:46:22,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-27 00:46:22,236 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:46:22,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-27 00:46:22,236 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:22,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:22,242 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-27 00:46:22,248 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:46:22,248 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-27 00:46:22,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-27 00:46:22,261 [ scc.git] DEBUG Already up to date.
2024-04-27 00:46:22,262 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-27 00:46:22,691 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-27 00:46:22,692 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-27 00:46:22,701 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:46:22,702 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:22,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:22,710 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-27 00:46:22,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:22,724 [ 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-27 00:46:22,762 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-27 00:46:22,762 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-27 00:46:22,763 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:46:22,763 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:46:22,770 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-27 00:46:22,778 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-27 00:46:22,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:22,959 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-27 00:46:22,968 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-27 00:46:22,975 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-27 00:46:22,981 [ scc.config] DEBUG Found github.token
2024-04-27 00:46:22,981 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-27 00:46:22,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:46:23,023 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:46:23,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:46:23,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:23,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:23,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca485bfbb0> has no local changes
2024-04-27 00:46:23,078 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:23,087 [ scc.git] DEBUG [detached HEAD c3554b6] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:23,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:23,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:46:23,163 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-27 00:46:23,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:23,379 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-27 00:46:23,384 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-27 00:46:23,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:23,784 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-27 00:46:23,789 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-27 00:46:24,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:24,199 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-27 00:46:24,204 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-27 00:46:24,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:24,615 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-27 00:46:24,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:25,009 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-27 00:46:25,015 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-27 00:46:25,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:25,414 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-27 00:46:25,419 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-27 00:46:25,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:25,813 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-27 00:46:25,817 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-27 00:46:26,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:26,222 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-27 00:46:26,228 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-27 00:46:26,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:26,624 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-27 00:46:26,629 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-27 00:46:27,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:27,031 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-27 00:46:27,036 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-27 00:46:27,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:27,444 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-27 00:46:27,450 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-27 00:46:27,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:27,854 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-27 00:46:27,860 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-27 00:46:28,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:28,278 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-27 00:46:28,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:28,686 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-27 00:46:29,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:29,093 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-27 00:46:29,098 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-27 00:46:29,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:29,517 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-27 00:46:29,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:29,926 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-27 00:46:30,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:30,322 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-27 00:46:30,328 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-27 00:46:30,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:30,731 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-27 00:46:30,735 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-27 00:46:31,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:31,144 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-27 00:46:31,148 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-27 00:46:31,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:31,549 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-27 00:46:31,554 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-27 00:46:31,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:46:31,966 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-27 00:46:31,966 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:46:32,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca498b9ac0> has local changes
2024-04-27 00:46:32,051 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/44/)'
2024-04-27 00:46:32,067 [ scc.git] DEBUG [detached HEAD a995cf4] merge master -Dorg -Ssuccess-only
2024-04-27 00:46:32,067 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-27 00:46:32,067 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-27 00:46:32,067 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,067 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-27 00:46:32,068 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-27 00:46:32,068 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-27 00:46:32,068 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-27 00:46:32,068 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-27 00:46:32,068 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-27 00:46:32,068 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-27 00:46:32,068 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-27 00:46:32,068 [ scc.merge] INFO
2024-04-27 00:46:32,068 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-27 00:46:32,068 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-27 00:46:32,069 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-27 00:46:32,069 [ scc.merge] INFO Updating 87d179a0..e5a45d60
2024-04-27 00:46:32,069 [ scc.merge] INFO Previously merged:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-27 00:46:32,069 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-27 00:46:32,069 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-27 00:46:32,069 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-27 00:46:32,069 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,069 [ scc.merge] INFO
2024-04-27 00:46:32,069 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-27 00:46:32,069 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-27 00:46:32,070 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-27 00:46:32,070 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-27 00:46:32,070 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-27 00:46:32,070 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-27 00:46:32,070 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-27 00:46:32,070 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,070 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-27 00:46:32,070 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,070 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-27 00:46:32,070 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,070 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,071 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,071 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Merged PRs:
2024-04-27 00:46:32,071 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-27 00:46:32,071 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,071 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,071 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-27 00:46:32,071 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO
2024-04-27 00:46:32,071 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-27 00:46:32,072 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,072 [ scc.merge] INFO
2024-04-27 00:46:32,072 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-27 00:46:32,072 [ scc.merge] INFO
2024-04-27 00:46:32,072 [ scc.merge] INFO Repository: ome/scripts
2024-04-27 00:46:32,072 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-27 00:46:32,072 [ scc.merge] INFO Already up to date.
2024-04-27 00:46:32,072 [ scc.merge] INFO
2024-04-27 00:46:32,072 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:46:32,072 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-27 00:46:32,072 [ scc.merge] INFO
2024-04-27 00:46:32,072 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-27 00:46:32,072 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-27 00:46:32,079 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-27 00:46:32,084 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-27 00:46:32,090 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-27 00:46:32,100 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-27 00:46:32,105 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-27 00:46:32,111 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-27 00:46:32,115 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-27 00:46:32,119 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-27 00:46:32,125 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-27 00:46:32,131 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-27 00:46:32,136 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-27 00:46:32,140 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-27 00:46:32,145 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-27 00:46:32,149 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-27 00:46:32,154 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-27 00:46:32,158 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-27 00:46:32,163 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-27 00:46:32,167 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-27 00:46:32,171 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-27 00:46:32,178 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-27 00:46:32,184 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-27 00:46:32,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-27 00:46:32,191 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:46:32,197 [ 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 5cf5b47] 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 5e13918] 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-27 00:47:17,678 [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-27 00:47:26,594 [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-27 00:47:29,023 [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-27 00:47:33,538 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-27 00:48:22,606 [ 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}
