Skipping 121 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-30 00:39:37,255 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-30 00:39:37,255 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-30 00:39:37,255 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-30 00:39:37,256 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-30 00:39:37,257 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-30 00:39:37,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:39:37,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-30 00:39:37,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:37,422 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-30 00:39:37,453 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:39:37,457 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-30 00:39:37,457 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-30 00:39:37,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:39:37,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:39:37,840 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:37,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:37,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:39:37,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:39:37,900 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4c10fd0> has no local changes
2024-03-30 00:39:37,900 [ 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)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:39:37,915 [ scc.git] DEBUG [detached HEAD 5c7da05f] merge master -Dorg -Ssuccess-only
2024-03-30 00:39:37,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:39:37,916 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:39:38,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-30 00:39:38,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-30 00:39:39,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-30 00:39:39,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-30 00:39:40,105 [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-03-30 00:39:40,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-30 00:39:41,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:41,042 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-30 00:39:41,042 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:39:41,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-30 00:39:41,042 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:41,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:41,050 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:39:41,058 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:39:41,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:39:41,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:39:41,074 [ scc.git] DEBUG Already up to date.
2024-03-30 00:39:41,074 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-30 00:39:41,482 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-30 00:39:41,483 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-30 00:39:41,492 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:39:41,493 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:41,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:41,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-30 00:39:41,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:41,520 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-30 00:39:41,535 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-30 00:39:41,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:39:41,539 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-30 00:39:41,539 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-30 00:39:41,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:39:41,686 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:39:41,737 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:41,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:41,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:39:41,799 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:39:41,810 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed43884f0> has no local changes
2024-03-30 00:39:41,811 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:39:41,822 [ scc.git] DEBUG [detached HEAD 3e2d78b] merge master -Dorg -Ssuccess-only
2024-03-30 00:39:41,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:39:41,822 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:39:42,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-30 00:39:42,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-30 00:39:42,599 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:39:43,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-30 00:39:43,609 [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-03-30 00:39:44,074 [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-03-30 00:39:44,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-30 00:39:44,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:44,951 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-30 00:39:44,951 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:39:44,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-30 00:39:44,951 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:44,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:44,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:39:44,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:39:44,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:39:44,968 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:39:44,974 [ scc.git] DEBUG Already up to date.
2024-03-30 00:39:44,974 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-30 00:39:45,418 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-30 00:39:45,419 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-30 00:39:45,425 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:39:45,425 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:45,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:45,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-30 00:39:45,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:45,445 [ 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-03-30 00:39:45,457 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:39:45,461 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-30 00:39:45,461 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-30 00:39:45,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:39:45,612 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:39:45,653 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:39:45,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:39:45,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:39:45,717 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:39:45,725 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed437da90> has no local changes
2024-03-30 00:39:45,725 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:39:45,737 [ scc.git] DEBUG [detached HEAD 5a5d286] merge master -Dorg -Ssuccess-only
2024-03-30 00:39:45,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:39:45,738 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:39:46,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-30 00:39:46,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-03-30 00:39:46,589 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:39:47,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-03-30 00:39:47,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-30 00:39:48,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:39:48,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-03-30 00:39:48,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f06f398570cddff1332355e1eda0fe54d88881d?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:48,977 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-03-30 00:39:49,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-30 00:39:49,432 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:39:49,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-30 00:39:50,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-30 00:39:50,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:39:51,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-30 00:39:51,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:51,877 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-30 00:39:52,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-30 00:39:52,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-30 00:39:53,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-30 00:39:53,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:39:54,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-30 00:39:54,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:54,635 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-30 00:39:55,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-30 00:39:55,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-30 00:39:56,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-30 00:39:56,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-30 00:39:56,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:39:57,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-30 00:39:57,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:39:57,768 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-30 00:39:58,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-30 00:39:58,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-30 00:39:59,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-30 00:39:59,621 [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-03-30 00:40:00,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-30 00:40:00,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:00,465 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-30 00:40:00,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-30 00:40:01,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-30 00:40:01,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-30 00:40:02,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-30 00:40:02,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:40:03,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-30 00:40:03,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:03,722 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-30 00:40:03,722 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:03,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-30 00:40:03,723 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:03,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:03,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:03,738 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:03,738 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:03,745 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:03,752 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:03,752 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-30 00:40:04,138 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:04,138 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-30 00:40:04,143 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-30 00:40:04,552 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:04,552 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-30 00:40:04,558 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-30 00:40:04,986 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:04,986 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-30 00:40:04,992 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-30 00:40:05,417 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:05,418 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-30 00:40:05,425 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-30 00:40:05,811 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:05,812 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-30 00:40:05,818 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-03-30 00:40:06,220 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-30 00:40:06,220 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-03-30 00:40:06,226 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:06,226 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:06,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:06,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-30 00:40:06,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:06,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-30 00:40:06,261 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:06,264 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-30 00:40:06,264 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-30 00:40:06,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:06,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-30 00:40:06,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:06,433 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-30 00:40:06,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:06,449 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-30 00:40:06,449 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-30 00:40:06,449 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-30 00:40:06,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:06,837 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-30 00:40:06,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:06,850 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-30 00:40:06,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:06,870 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-30 00:40:06,870 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-30 00:40:06,870 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-30 00:40:06,870 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-30 00:40:06,870 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-30 00:40:06,870 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-30 00:40:06,870 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-30 00:40:07,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:07,246 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-30 00:40:07,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:07,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-30 00:40:07,292 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-30 00:40:07,293 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:07,300 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-03-30 00:40:07,300 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-30 00:40:07,300 [ scc.git] DEBUG src/app/header.html | 5 +
2024-03-30 00:40:07,300 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-03-30 00:40:07,300 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-30 00:40:07,300 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-03-30 00:40:07,301 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-03-30 00:40:07,301 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-30 00:40:07,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:07,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-30 00:40:07,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:07,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-30 00:40:07,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:07,683 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-30 00:40:07,684 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-30 00:40:08,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:08,046 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-03-30 00:40:08,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:08,061 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 468 (Bump express from 4.18.2 to 4.19.2) 9f06f398570cddff1332355e1eda0fe54d88881d'
2024-03-30 00:40:08,111 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-30 00:40:08,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:08,121 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-03-30 00:40:08,121 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-03-30 00:40:08,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:08,455 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:08,494 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:08,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:08,501 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:08,541 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:08,552 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4badf40> has no local changes
2024-03-30 00:40:08,552 [ 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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
Generated by OMERO-plugins-push#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:08,565 [ scc.git] DEBUG [detached HEAD d165a4d] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:08,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:08,566 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:08,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-30 00:40:09,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-30 00:40:09,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-30 00:40:10,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-30 00:40:10,881 [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-03-30 00:40:11,369 [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-03-30 00:40:11,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-30 00:40:12,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:12,203 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-30 00:40:12,203 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:12,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-30 00:40:12,203 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:12,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:12,209 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:12,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:12,216 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:12,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:12,228 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:12,229 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-30 00:40:12,631 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-30 00:40:12,632 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-30 00:40:12,636 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:12,636 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:12,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:12,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-30 00:40:12,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:12,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-30 00:40:12,664 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:12,666 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-30 00:40:12,666 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-30 00:40:12,666 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-30 00:40:12,666 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-30 00:40:12,666 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-30 00:40:12,666 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-30 00:40:12,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:12,812 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:12,858 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:12,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:12,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:12,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:12,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4bc6490> has no local changes
2024-03-30 00:40:12,917 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:12,928 [ scc.git] DEBUG [detached HEAD 0b8c59b] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:12,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:12,929 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:13,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-30 00:40:13,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-30 00:40:14,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-30 00:40:14,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-30 00:40:15,267 [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-03-30 00:40:15,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-30 00:40:16,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-30 00:40:16,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:16,632 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-30 00:40:17,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-30 00:40:17,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-30 00:40:18,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-30 00:40:18,468 [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-03-30 00:40:18,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-30 00:40:19,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:19,394 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-30 00:40:19,394 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:19,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-30 00:40:19,394 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:19,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:19,400 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:19,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:19,405 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:19,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:19,416 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:19,416 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-30 00:40:19,834 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-30 00:40:19,834 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-30 00:40:19,838 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-30 00:40:20,248 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-30 00:40:20,249 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-30 00:40:20,254 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:20,254 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:20,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:20,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-30 00:40:20,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:20,273 [ 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-03-30 00:40:20,290 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-30 00:40:20,291 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-30 00:40:20,291 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-30 00:40:20,291 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-30 00:40:20,291 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:40:20,291 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:40:20,298 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-30 00:40:20,306 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-30 00:40:20,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:20,469 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-30 00:40:20,477 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-30 00:40:20,486 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-03-30 00:40:20,493 [ scc.config] DEBUG Found github.token
2024-03-30 00:40:20,494 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-30 00:40:20,494 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-30 00:40:20,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:20,511 [ 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-03-30 00:40:20,535 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-30 00:40:20,535 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-30 00:40:20,535 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-30 00:40:20,535 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:40:20,536 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:40:20,543 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-30 00:40:20,553 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-30 00:40:20,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:20,878 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-30 00:40:20,886 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-30 00:40:20,894 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/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-03-30 00:40:20,911 [ scc.config] DEBUG Found github.token
2024-03-30 00:40:20,911 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-30 00:40:20,912 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:20,980 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:20,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:20,987 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:21,037 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:21,050 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4bbbe80> has no local changes
2024-03-30 00:40:21,050 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:21,063 [ scc.git] DEBUG [detached HEAD a96bbd8] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:21,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:21,064 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:21,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-30 00:40:21,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-30 00:40:21,928 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:40:22,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-30 00:40:22,930 [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-03-30 00:40:23,397 [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-03-30 00:40:23,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-30 00:40:24,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:24,357 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-30 00:40:24,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-30 00:40:24,812 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:40:25,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-30 00:40:25,787 [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-03-30 00:40:26,284 [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-03-30 00:40:26,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-30 00:40:27,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:27,254 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-30 00:40:27,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-30 00:40:27,706 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-30 00:40:28,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-30 00:40:28,742 [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-03-30 00:40:29,221 [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-03-30 00:40:29,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-30 00:40:30,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:30,080 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-30 00:40:30,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-30 00:40:30,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-30 00:40:31,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-30 00:40:31,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-30 00:40:32,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-30 00:40:32,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-30 00:40:32,885 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:32,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-30 00:40:32,886 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:32,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:32,895 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:32,902 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:32,903 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:32,911 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:32,920 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:32,921 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-30 00:40:33,334 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-30 00:40:33,335 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-30 00:40:33,340 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-30 00:40:33,774 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-30 00:40:33,774 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-30 00:40:33,784 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-30 00:40:34,185 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-30 00:40:34,186 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-30 00:40:34,195 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:34,195 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:34,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:34,201 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-30 00:40:34,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:34,213 [ 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-03-30 00:40:34,222 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:34,225 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-30 00:40:34,225 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-30 00:40:34,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:34,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-30 00:40:34,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:34,408 [ 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-03-30 00:40:34,422 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-30 00:40:34,423 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:34,427 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-30 00:40:34,427 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-30 00:40:34,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:34,827 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-30 00:40:34,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:34,846 [ 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-03-30 00:40:34,862 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-30 00:40:34,863 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:34,868 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-30 00:40:34,869 [ scc.git] DEBUG package.json | 2 +-
2024-03-30 00:40:34,869 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-30 00:40:35,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:35,236 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:35,292 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:35,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:35,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:35,340 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:35,347 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed42eaf10> has no local changes
2024-03-30 00:40:35,348 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:35,357 [ scc.git] DEBUG [detached HEAD 553a1af] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:35,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:35,357 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:35,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-30 00:40:36,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-30 00:40:36,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-30 00:40:37,148 [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-03-30 00:40:37,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-30 00:40:38,056 [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-03-30 00:40:38,057 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-30 00:40:38,057 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:38,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-30 00:40:38,057 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:38,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:38,062 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:38,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:38,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:38,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:38,078 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:38,078 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-30 00:40:38,474 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-30 00:40:38,475 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-30 00:40:38,479 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:38,479 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:38,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:38,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-30 00:40:38,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:38,496 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-30 00:40:38,506 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:38,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:38,663 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:38,705 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:38,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:38,711 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:38,751 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:38,757 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed434d880> has no local changes
2024-03-30 00:40:38,758 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:38,767 [ scc.git] DEBUG [detached HEAD bf0533b] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:38,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:38,768 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:39,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-30 00:40:39,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-30 00:40:40,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-30 00:40:40,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-30 00:40:40,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-30 00:40:41,419 [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-03-30 00:40:41,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-30 00:40:42,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:42,314 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-30 00:40:42,314 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:42,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-30 00:40:42,315 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:42,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:42,320 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:42,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:42,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:42,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:42,338 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:42,339 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-30 00:40:42,739 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-30 00:40:42,739 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-30 00:40:42,744 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:42,744 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:42,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:42,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-30 00:40:42,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:42,765 [ 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-03-30 00:40:42,776 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-30 00:40:42,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:42,779 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-30 00:40:42,779 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-30 00:40:42,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:42,930 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:42,978 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:42,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:42,983 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:43,024 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:43,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4333550> has no local changes
2024-03-30 00:40:43,031 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:43,039 [ scc.git] DEBUG [detached HEAD 51d8cbe] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:43,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:43,040 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:43,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-30 00:40:43,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-30 00:40:44,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-30 00:40:44,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-30 00:40:45,368 [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-03-30 00:40:45,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-30 00:40:46,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:40:46,305 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-30 00:40:46,305 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:46,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-30 00:40:46,306 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:46,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:46,313 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:46,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:46,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:46,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:46,332 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:46,333 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-30 00:40:46,716 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-30 00:40:46,716 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-30 00:40:46,721 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:46,721 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:46,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:46,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-30 00:40:46,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:46,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-30 00:40:46,752 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG Auto-merging setup.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-30 00:40:46,752 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:40:46,753 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:40:46,759 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-30 00:40:46,767 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-30 00:40:46,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:46,957 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-30 00:40:46,965 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-30 00:40:46,974 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-03-30 00:40:46,982 [ scc.config] DEBUG Found github.token
2024-03-30 00:40:46,983 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-30 00:40:46,983 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:47,040 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:47,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:47,048 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:47,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:47,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed434d640> has no local changes
2024-03-30 00:40:47,115 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:47,125 [ scc.git] DEBUG [detached HEAD ae32f5a] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:47,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:47,126 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:47,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-30 00:40:47,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-30 00:40:48,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-30 00:40:48,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-30 00:40:49,285 [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-03-30 00:40:49,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-30 00:40:50,198 [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-03-30 00:40:50,200 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-30 00:40:50,200 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:50,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-30 00:40:50,200 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:50,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:50,209 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:50,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:50,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:50,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:50,240 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:50,241 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-30 00:40:50,650 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-30 00:40:50,651 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-30 00:40:50,658 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:50,659 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:50,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:50,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-30 00:40:50,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:50,696 [ 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-03-30 00:40:50,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-30 00:40:50,723 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-30 00:40:50,724 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-30 00:40:50,724 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-30 00:40:50,724 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-30 00:40:50,724 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-30 00:40:50,724 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-30 00:40:50,724 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-30 00:40:50,726 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-30 00:40:50,727 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-30 00:40:50,727 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-30 00:40:50,727 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-30 00:40:50,727 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-30 00:40:50,727 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-30 00:40:50,728 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-30 00:40:50,729 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-30 00:40:50,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:50,889 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:50,941 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:50,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:50,948 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:50,995 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:51,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed42ea370> has no local changes
2024-03-30 00:40:51,004 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:51,014 [ scc.git] DEBUG [detached HEAD 9cdd6fd] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:51,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:51,015 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:51,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-30 00:40:51,305 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:51,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-30 00:40:51,305 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,312 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:51,318 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:51,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:51,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:51,336 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:51,336 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:51,336 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:51,388 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:51,440 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:51,447 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4346fa0> has no local changes
2024-03-30 00:40:51,447 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:51,457 [ scc.git] DEBUG [detached HEAD b30693b] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:51,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:51,457 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:51,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-30 00:40:51,729 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:51,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-30 00:40:51,729 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,737 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:51,744 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:51,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:51,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:51,764 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:51,765 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:51,765 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,774 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:51,817 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:51,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:51,823 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:51,864 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:51,871 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed42ffa60> has no local changes
2024-03-30 00:40:51,871 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:51,882 [ scc.git] DEBUG [detached HEAD f00c58b] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:51,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:51,883 [ scc.git] INFO Overriding base-branch from master to main
2024-03-30 00:40:51,883 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:52,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-30 00:40:52,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-30 00:40:53,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-30 00:40:53,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-30 00:40:54,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-30 00:40:54,588 [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-03-30 00:40:55,018 [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-03-30 00:40:55,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-30 00:40:55,949 [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-03-30 00:40:55,950 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-30 00:40:55,950 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:55,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-30 00:40:55,951 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:55,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:55,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-30 00:40:55,965 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:55,965 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-30 00:40:55,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-30 00:40:55,990 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:55,990 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-30 00:40:56,421 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-30 00:40:56,422 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-30 00:40:56,426 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:56,426 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:56,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:56,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-30 00:40:56,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:56,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-30 00:40:56,456 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-30 00:40:56,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-30 00:40:56,456 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:40:56,456 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:40:56,463 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-30 00:40:56,470 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-30 00:40:56,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:40:56,631 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-30 00:40:56,637 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-30 00:40:56,643 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-30 00:40:56,649 [ scc.config] DEBUG Found github.token
2024-03-30 00:40:56,649 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-30 00:40:56,650 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:56,690 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:56,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:56,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:56,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:56,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4274fd0> has no local changes
2024-03-30 00:40:56,744 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:56,754 [ scc.git] DEBUG [detached HEAD 3363c01] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:56,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:56,754 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:57,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-30 00:40:57,058 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:57,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-30 00:40:57,058 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:57,072 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:57,073 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:57,081 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:57,089 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:57,089 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:57,090 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,098 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:57,153 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,161 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:57,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:57,219 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed42ffaf0> has no local changes
2024-03-30 00:40:57,220 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:57,231 [ scc.git] DEBUG [detached HEAD 770b49d] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:57,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:57,232 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:57,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-30 00:40:57,479 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:40:57,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-30 00:40:57,480 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:40:57,493 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:40:57,493 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:40:57,499 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:40:57,506 [ scc.git] DEBUG Already up to date.
2024-03-30 00:40:57,506 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:40:57,506 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:40:57,554 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:40:57,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:40:57,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:40:57,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:40:57,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4289520> has no local changes
2024-03-30 00:40:57,612 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:40:57,622 [ scc.git] DEBUG [detached HEAD 4e280d6] merge master -Dorg -Ssuccess-only
2024-03-30 00:40:57,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:40:57,623 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:40:58,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-30 00:40:58,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-30 00:40:58,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-30 00:40:59,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-30 00:40:59,855 [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-03-30 00:41:00,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-30 00:41:00,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:41:00,800 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-30 00:41:00,800 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:41:00,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-30 00:41:00,801 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:00,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:00,813 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-30 00:41:00,822 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:41:00,823 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-30 00:41:00,831 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-30 00:41:00,842 [ scc.git] DEBUG Already up to date.
2024-03-30 00:41:00,843 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-30 00:41:01,229 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-30 00:41:01,230 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-30 00:41:01,236 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:41:01,236 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:01,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:01,244 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-30 00:41:01,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:01,260 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-30 00:41:01,273 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-30 00:41:01,273 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-30 00:41:01,273 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:41:01,274 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:41:01,281 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-30 00:41:01,289 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-30 00:41:01,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:01,441 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-30 00:41:01,449 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-30 00:41:01,458 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-30 00:41:01,465 [ scc.config] DEBUG Found github.token
2024-03-30 00:41:01,466 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-30 00:41:01,466 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:41:01,519 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:01,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:01,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:41:01,573 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:41:01,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed42a38e0> has no local changes
2024-03-30 00:41:01,583 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:41:01,593 [ scc.git] DEBUG [detached HEAD 9f60bed] merge master -Dorg -Ssuccess-only
2024-03-30 00:41:01,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:01,594 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-30 00:41:01,594 [ scc.repo] DEBUG ## PRs found:
2024-03-30 00:41:01,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-30 00:41:02,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-30 00:41:02,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-30 00:41:03,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-30 00:41:03,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-30 00:41:04,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-30 00:41:04,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-30 00:41:05,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-30 00:41:05,547 [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-03-30 00:41:06,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-30 00:41:06,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-30 00:41:06,465 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-30 00:41:06,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-30 00:41:07,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-30 00:41:07,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-30 00:41:08,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-30 00:41:08,380 [ scc.repo] DEBUG ## Branches found:
2024-03-30 00:41:08,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-30 00:41:08,380 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:08,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:08,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-30 00:41:08,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-30 00:41:08,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-30 00:41:08,401 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-30 00:41:08,409 [ scc.git] DEBUG Already up to date.
2024-03-30 00:41:08,409 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-30 00:41:08,841 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-30 00:41:08,842 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-30 00:41:08,846 [ scc.git] DEBUG ## Unique users: []
2024-03-30 00:41:08,846 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:08,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:08,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-30 00:41:08,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:08,868 [ 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-03-30 00:41:08,879 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-30 00:41:08,879 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-30 00:41:08,879 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-30 00:41:08,880 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-30 00:41:08,886 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-30 00:41:08,893 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-30 00:41:09,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:09,052 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-30 00:41:09,059 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-30 00:41:09,066 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#16](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-30 00:41:09,071 [ scc.config] DEBUG Found github.token
2024-03-30 00:41:09,072 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-30 00:41:09,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-30 00:41:09,126 [ scc.git] DEBUG Get sha1 of %s
2024-03-30 00:41:09,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-30 00:41:09,132 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:41:09,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:41:09,183 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed4299b50> has no local changes
2024-03-30 00:41:09,183 [ 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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:41:09,193 [ scc.git] DEBUG [detached HEAD f192e01] merge master -Dorg -Ssuccess-only
2024-03-30 00:41:09,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:09,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-30 00:41:09,272 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-30 00:41:09,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:09,474 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-30 00:41:09,479 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-30 00:41:09,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:09,900 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-30 00:41:09,910 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-30 00:41:10,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:10,282 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-30 00:41:10,291 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-30 00:41:10,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:10,726 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-30 00:41:11,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:11,117 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-30 00:41:11,122 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-30 00:41:11,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:11,571 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-30 00:41:11,576 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-30 00:41:11,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:11,970 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-30 00:41:11,977 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-30 00:41:12,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:12,373 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-30 00:41:12,378 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-30 00:41:12,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:12,776 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-30 00:41:12,782 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-30 00:41:13,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:13,168 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-30 00:41:13,173 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-30 00:41:13,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:13,582 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-30 00:41:13,588 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-30 00:41:13,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:13,990 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-30 00:41:13,998 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-30 00:41:14,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:14,402 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-30 00:41:14,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:14,801 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-30 00:41:15,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:15,197 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-30 00:41:15,203 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-30 00:41:15,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:15,609 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-30 00:41:15,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:16,016 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-30 00:41:16,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:16,411 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-30 00:41:16,417 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-30 00:41:16,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:16,827 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-30 00:41:16,833 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-30 00:41:17,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:17,236 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-30 00:41:17,241 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-30 00:41:17,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:17,653 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-30 00:41:17,660 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-30 00:41:18,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-30 00:41:18,054 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-30 00:41:18,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-30 00:41:18,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ed5cdcb20> has local changes
2024-03-30 00:41:18,141 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
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)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
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#16 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/16/)'
2024-03-30 00:41:18,163 [ scc.git] DEBUG [detached HEAD 2c0c32d] merge master -Dorg -Ssuccess-only
2024-03-30 00:41:18,163 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-30 00:41:18,166 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-30 00:41:18,166 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-30 00:41:18,167 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-30 00:41:18,167 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-30 00:41:18,167 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-30 00:41:18,167 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-30 00:41:18,167 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,167 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-30 00:41:18,167 [ scc.merge] INFO
2024-03-30 00:41:18,167 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-30 00:41:18,168 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-30 00:41:18,168 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-30 00:41:18,168 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-30 00:41:18,168 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-30 00:41:18,168 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-30 00:41:18,168 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,168 [ scc.merge] INFO
2024-03-30 00:41:18,168 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,168 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-30 00:41:18,169 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-30 00:41:18,169 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-30 00:41:18,169 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-30 00:41:18,169 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-30 00:41:18,169 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-30 00:41:18,169 [ scc.merge] INFO
2024-03-30 00:41:18,169 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-30 00:41:18,169 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-30 00:41:18,169 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-30 00:41:18,170 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-30 00:41:18,170 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-30 00:41:18,170 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-30 00:41:18,170 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-30 00:41:18,170 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-30 00:41:18,170 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,170 [ scc.merge] INFO Merged PRs:
2024-03-30 00:41:18,170 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-30 00:41:18,170 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-30 00:41:18,171 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,171 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,171 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-30 00:41:18,171 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,171 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-30 00:41:18,171 [ scc.merge] INFO
2024-03-30 00:41:18,171 [ scc.merge] INFO Repository: ome/scripts
2024-03-30 00:41:18,171 [ scc.merge] INFO Excluded PRs:
2024-03-30 00:41:18,171 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-30 00:41:18,171 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-30 00:41:18,172 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-30 00:41:18,172 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-30 00:41:18,172 [ scc.merge] INFO Already up to date.
2024-03-30 00:41:18,172 [ scc.merge] INFO
2024-03-30 00:41:18,172 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-30 00:41:18,172 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-30 00:41:18,172 [ scc.merge] INFO
2024-03-30 00:41:18,172 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-30 00:41:18,172 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-30 00:41:18,179 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-30 00:41:18,185 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-30 00:41:18,193 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-30 00:41:18,203 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-30 00:41:18,212 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-30 00:41:18,218 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-30 00:41:18,225 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-30 00:41:18,231 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-30 00:41:18,238 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-30 00:41:18,244 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-30 00:41:18,250 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-30 00:41:18,256 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-30 00:41:18,263 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-30 00:41:18,269 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-30 00:41:18,276 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-30 00:41:18,282 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-30 00:41:18,288 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-30 00:41:18,294 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-30 00:41:18,300 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-30 00:41:18,306 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-30 00:41:18,313 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-30 00:41:18,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-30 00:41:18,319 [ scc.git] DEBUG Calling 'git remote'
2024-03-30 00:41:18,325 [ 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 f4fe201] 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 3b7ccfa8
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 a232ed0
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 2078ac7
nothing to commit, working tree clean
[detached HEAD a2d20d7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-03-30 00:42:05,581 [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-03-30 00:42:14,442 [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-03-30 00:42:16,747 [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-03-30 00:42:21,286 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-30 00:43:08,200 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
