Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-06 00:44:47,407 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-06 00:44:47,407 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-06 00:44:47,407 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-06 00:44:47,408 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-06 00:44:47,408 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-06 00:44:47,408 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-06 00:44:47,408 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-06 00:44:47,409 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-06 00:44:47,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:44:47,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-06 00:44:47,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:47,572 [ 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-04-06 00:44:47,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:44:47,613 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-06 00:44:47,613 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-06 00:44:47,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:44:47,961 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:44:48,000 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:48,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:48,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:44:48,044 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:44:48,056 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c342be0> has no local changes
2024-04-06 00:44:48,056 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:44:48,085 [ scc.git] DEBUG [detached HEAD e2814485] merge master -Dorg -Ssuccess-only
2024-04-06 00:44:48,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:44:48,086 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:44:48,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-06 00:44:48,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-06 00:44:49,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-06 00:44:49,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-06 00:44:50,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:44:50,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-06 00:44:51,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:44:51,191 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-06 00:44:51,191 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:44:51,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-06 00:44:51,191 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:51,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:51,197 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:44:51,202 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:44:51,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:44:51,208 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:44:51,214 [ scc.git] DEBUG Already up to date.
2024-04-06 00:44:51,215 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-06 00:44:51,652 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-06 00:44:51,652 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-06 00:44:51,658 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:44:51,658 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:51,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:51,664 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-06 00:44:51,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:51,678 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-06 00:44:51,713 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-06 00:44:51,714 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:44:51,717 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-06 00:44:51,717 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-06 00:44:51,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:44:51,869 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:44:51,920 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:51,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:51,927 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:44:51,977 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:44:51,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c2a8550> has no local changes
2024-04-06 00:44:51,987 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:44:51,999 [ scc.git] DEBUG [detached HEAD 07909d9] merge master -Dorg -Ssuccess-only
2024-04-06 00:44:52,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:44:52,000 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:44:52,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-06 00:44:52,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-06 00:44:52,796 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:44:53,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-06 00:44:53,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:44:54,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:44:54,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-06 00:44:55,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:44:55,349 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-06 00:44:55,349 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:44:55,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-06 00:44:55,350 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:55,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:55,359 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:44:55,368 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:44:55,369 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:44:55,379 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:44:55,390 [ scc.git] DEBUG Already up to date.
2024-04-06 00:44:55,390 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-06 00:44:55,814 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-06 00:44:55,814 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-06 00:44:55,821 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:44:55,821 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:55,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:55,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-06 00:44:55,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:55,841 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-06 00:44:55,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:44:55,858 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-06 00:44:55,858 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-06 00:44:56,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:44:56,014 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:44:56,074 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:44:56,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:44:56,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:44:56,139 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:44:56,148 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c2a49d0> has no local changes
2024-04-06 00:44:56,148 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:44:56,158 [ scc.git] DEBUG [detached HEAD 108cf3d] merge master -Dorg -Ssuccess-only
2024-04-06 00:44:56,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:44:56,159 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:44:56,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-06 00:44:57,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-06 00:44:57,014 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:44:57,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-06 00:44:58,220 [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-04-06 00:44:58,773 [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-04-06 00:44:59,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-06 00:44:59,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f06f398570cddff1332355e1eda0fe54d88881d?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:44:59,633 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-06 00:45:00,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-06 00:45:00,083 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:45:00,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-06 00:45:01,165 [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-04-06 00:45:01,657 [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-04-06 00:45:02,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-06 00:45:02,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:02,606 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-06 00:45:03,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-06 00:45:03,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-06 00:45:03,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-06 00:45:04,459 [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-04-06 00:45:04,900 [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-04-06 00:45:05,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-06 00:45:05,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:05,800 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-06 00:45:06,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-06 00:45:06,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-06 00:45:07,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-06 00:45:07,687 [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-04-06 00:45:08,164 [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-04-06 00:45:08,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-06 00:45:09,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:09,043 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-06 00:45:09,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-06 00:45:09,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-06 00:45:10,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-06 00:45:10,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:11,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-06 00:45:11,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:11,808 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-06 00:45:12,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-06 00:45:12,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-06 00:45:13,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-06 00:45:13,665 [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-04-06 00:45:14,152 [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-04-06 00:45:14,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-06 00:45:15,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:15,066 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-06 00:45:15,066 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:15,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-06 00:45:15,067 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:15,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:15,072 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:15,078 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:15,078 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:15,084 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:15,090 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:15,091 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-06 00:45:15,619 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:15,619 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-06 00:45:15,625 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-06 00:45:16,080 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:16,081 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-06 00:45:16,087 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-06 00:45:16,634 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:16,635 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-06 00:45:16,642 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-06 00:45:17,488 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:17,488 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-06 00:45:17,495 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-06 00:45:17,895 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:17,895 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-06 00:45:17,901 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-06 00:45:18,306 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-06 00:45:18,306 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-06 00:45:18,313 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:18,313 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:18,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:18,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-06 00:45:18,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:18,332 [ 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-04-06 00:45:18,374 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:18,378 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-06 00:45:18,378 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-06 00:45:18,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:18,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-06 00:45:18,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:18,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-06 00:45:18,598 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:18,603 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-06 00:45:18,604 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-06 00:45:18,604 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-06 00:45:18,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:18,941 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-06 00:45:18,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:18,962 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-06 00:45:19,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:19,032 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-06 00:45:19,032 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-06 00:45:19,033 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-06 00:45:19,033 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-06 00:45:19,033 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-06 00:45:19,033 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-06 00:45:19,033 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-06 00:45:19,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:19,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-06 00:45:19,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:19,366 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-06 00:45:19,514 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-06 00:45:19,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:19,523 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-06 00:45:19,523 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-06 00:45:19,523 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-06 00:45:19,523 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-04-06 00:45:19,523 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-06 00:45:19,523 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-06 00:45:19,523 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-04-06 00:45:19,523 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-06 00:45:19,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:19,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-06 00:45:19,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:19,784 [ 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-04-06 00:45:19,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:19,869 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-06 00:45:19,869 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-06 00:45:20,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:20,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-06 00:45:20,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:20,182 [ 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-04-06 00:45:20,332 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-06 00:45:20,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:20,347 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-06 00:45:20,347 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-06 00:45:20,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:20,569 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:20,618 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:20,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:20,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:20,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:20,685 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c28f5b0> has no local changes
2024-04-06 00:45:20,686 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:20,702 [ scc.git] DEBUG [detached HEAD f7671dd] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:20,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:20,703 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:21,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-06 00:45:21,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-06 00:45:22,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-06 00:45:22,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-06 00:45:23,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:23,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:45:24,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-06 00:45:24,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:24,423 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-06 00:45:24,423 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:24,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-06 00:45:24,423 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:24,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:24,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:24,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:24,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:24,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:24,446 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:24,446 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-06 00:45:24,840 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-06 00:45:24,841 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-06 00:45:24,846 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:24,846 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:24,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:24,853 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-06 00:45:24,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:24,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-06 00:45:24,879 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:24,882 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-06 00:45:24,882 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-06 00:45:24,882 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-06 00:45:24,882 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-06 00:45:24,882 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-06 00:45:24,882 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-06 00:45:25,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:25,040 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:25,081 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:25,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:25,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:25,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:25,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c2cd4f0> has no local changes
2024-04-06 00:45:25,135 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:25,145 [ scc.git] DEBUG [detached HEAD 203af12] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:25,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:25,145 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:25,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-06 00:45:26,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-06 00:45:26,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-06 00:45:27,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-06 00:45:27,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:28,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-06 00:45:28,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:28,443 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-06 00:45:28,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-06 00:45:29,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-06 00:45:29,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-06 00:45:30,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:30,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-06 00:45:31,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:31,297 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-06 00:45:31,297 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:31,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-06 00:45:31,297 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:31,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:31,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:31,309 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:31,310 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:31,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:31,324 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:31,324 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-06 00:45:31,969 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-06 00:45:31,970 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-06 00:45:31,976 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-06 00:45:32,712 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-06 00:45:32,712 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-06 00:45:32,717 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:32,718 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:32,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:32,724 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-06 00:45:32,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:32,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-06 00:45:32,817 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-06 00:45:32,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-06 00:45:32,817 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-06 00:45:32,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-06 00:45:32,818 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:45:32,819 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:45:32,827 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-06 00:45:32,834 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-06 00:45:32,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:32,998 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-06 00:45:33,007 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-06 00:45:33,016 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-06 00:45:33,023 [ scc.config] DEBUG Found github.token
2024-04-06 00:45:33,023 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-06 00:45:33,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-06 00:45:33,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:33,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-06 00:45:33,078 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-06 00:45:33,078 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-06 00:45:33,078 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-06 00:45:33,078 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:45:33,079 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:45:33,088 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-06 00:45:33,099 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-06 00:45:33,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:33,408 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-06 00:45:33,416 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-06 00:45:33,423 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-04-06 00:45:33,430 [ scc.config] DEBUG Found github.token
2024-04-06 00:45:33,430 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-06 00:45:33,430 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:33,474 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:33,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:33,482 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:33,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:33,535 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c28f550> has no local changes
2024-04-06 00:45:33,535 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:33,545 [ scc.git] DEBUG [detached HEAD 9345915] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:33,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:33,545 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:33,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-06 00:45:34,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-06 00:45:34,426 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:45:34,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-06 00:45:35,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:35,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:45:36,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-06 00:45:36,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:36,830 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-06 00:45:37,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-06 00:45:37,287 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:45:37,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-06 00:45:38,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:38,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:45:39,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-06 00:45:39,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:39,733 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-06 00:45:40,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-06 00:45:40,195 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-06 00:45:40,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-06 00:45:41,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:41,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:45:42,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-06 00:45:42,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:42,706 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-06 00:45:43,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-06 00:45:43,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-06 00:45:44,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-06 00:45:44,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-06 00:45:45,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-06 00:45:45,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-06 00:45:45,529 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:45,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-06 00:45:45,529 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:45,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:45,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:45,540 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:45,540 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:45,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:45,554 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:45,554 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-06 00:45:45,949 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-06 00:45:45,949 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-06 00:45:45,956 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-06 00:45:46,382 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-06 00:45:46,382 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-06 00:45:46,387 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-06 00:45:46,795 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-06 00:45:46,795 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-06 00:45:46,807 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:46,807 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:46,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:46,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-06 00:45:46,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:46,828 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-06 00:45:46,837 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:46,840 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-06 00:45:46,840 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-06 00:45:47,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:47,002 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-06 00:45:47,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:47,015 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-06 00:45:47,075 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-06 00:45:47,075 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:47,078 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-06 00:45:47,078 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-06 00:45:47,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:47,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-06 00:45:47,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:47,421 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-06 00:45:47,445 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-06 00:45:47,445 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:47,449 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-06 00:45:47,449 [ scc.git] DEBUG package.json | 2 +-
2024-04-06 00:45:47,449 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-06 00:45:47,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:47,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:47,866 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:47,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:47,872 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:47,911 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:47,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c29cfd0> has no local changes
2024-04-06 00:45:47,919 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:47,929 [ scc.git] DEBUG [detached HEAD 2cecb78] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:47,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:47,930 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:48,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-06 00:45:48,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-06 00:45:49,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-06 00:45:49,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:50,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-06 00:45:50,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:50,656 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-06 00:45:50,656 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:50,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-06 00:45:50,656 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:50,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:50,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:50,668 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:50,668 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:50,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:50,681 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:50,681 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-06 00:45:51,067 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-06 00:45:51,067 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-06 00:45:51,072 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:51,072 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:51,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:51,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-06 00:45:51,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:51,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-06 00:45:51,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:51,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:51,251 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:51,294 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:51,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:51,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:51,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:51,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c219340> has no local changes
2024-04-06 00:45:51,346 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:51,354 [ scc.git] DEBUG [detached HEAD 63c80a0] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:51,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:51,354 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:51,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-06 00:45:52,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-06 00:45:52,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-06 00:45:53,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-06 00:45:53,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-06 00:45:54,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:54,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-06 00:45:54,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:54,993 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-06 00:45:54,993 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:54,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-06 00:45:54,993 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:54,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:54,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:55,005 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:55,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:55,011 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:55,018 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:55,018 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-06 00:45:55,528 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-06 00:45:55,528 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-06 00:45:55,535 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:55,535 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:55,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:55,542 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-06 00:45:55,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:55,559 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-06 00:45:55,570 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-06 00:45:55,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:45:55,573 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-06 00:45:55,573 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-06 00:45:55,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:55,734 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:55,778 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:55,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:55,785 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:55,840 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:55,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c2686d0> has no local changes
2024-04-06 00:45:55,849 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:55,861 [ scc.git] DEBUG [detached HEAD c23da61] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:55,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:55,862 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:45:56,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-06 00:45:56,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-06 00:45:57,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-06 00:45:57,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-06 00:45:58,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:45:58,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-06 00:45:59,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:45:59,014 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-06 00:45:59,014 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:45:59,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-06 00:45:59,014 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:59,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:59,020 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:45:59,026 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:45:59,026 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:45:59,032 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:45:59,039 [ scc.git] DEBUG Already up to date.
2024-04-06 00:45:59,039 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-06 00:45:59,534 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-06 00:45:59,534 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-06 00:45:59,540 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:45:59,541 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:59,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:59,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-06 00:45:59,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:59,565 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-06 00:45:59,630 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-06 00:45:59,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-06 00:45:59,630 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-06 00:45:59,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-06 00:45:59,631 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-06 00:45:59,631 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-06 00:45:59,631 [ scc.git] DEBUG Auto-merging setup.py
2024-04-06 00:45:59,631 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-06 00:45:59,631 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:45:59,631 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:45:59,640 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-06 00:45:59,650 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-06 00:45:59,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:45:59,814 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-06 00:45:59,821 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-06 00:45:59,829 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-04-06 00:45:59,835 [ scc.config] DEBUG Found github.token
2024-04-06 00:45:59,836 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-06 00:45:59,836 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:45:59,881 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:45:59,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:45:59,889 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:45:59,943 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:45:59,952 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c2a4e80> has no local changes
2024-04-06 00:45:59,952 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:45:59,967 [ scc.git] DEBUG [detached HEAD 536f943] merge master -Dorg -Ssuccess-only
2024-04-06 00:45:59,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:45:59,968 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:00,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-06 00:46:00,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-06 00:46:01,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-06 00:46:01,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-06 00:46:02,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:46:02,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-06 00:46:03,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:46:03,139 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-06 00:46:03,139 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:03,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-06 00:46:03,139 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:03,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:03,145 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:03,150 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:03,150 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:03,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:03,163 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:03,163 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-06 00:46:03,622 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-06 00:46:03,622 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-06 00:46:03,628 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:03,628 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:03,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:03,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-06 00:46:03,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:03,648 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-04-06 00:46:03,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-06 00:46:03,830 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-06 00:46:03,830 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-06 00:46:03,830 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-06 00:46:03,830 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-06 00:46:03,830 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-06 00:46:03,832 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-06 00:46:03,832 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-06 00:46:03,833 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-06 00:46:03,834 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-06 00:46:03,834 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-06 00:46:03,834 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-06 00:46:03,834 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-06 00:46:03,834 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-06 00:46:03,834 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-06 00:46:03,835 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-06 00:46:03,835 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-06 00:46:03,835 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-06 00:46:03,835 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-06 00:46:03,835 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-06 00:46:03,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:03,983 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:04,028 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,036 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:04,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:04,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c29cdf0> has no local changes
2024-04-06 00:46:04,083 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:04,092 [ scc.git] DEBUG [detached HEAD 030df4b] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:04,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:04,092 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:04,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-06 00:46:04,401 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:04,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-06 00:46:04,402 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,408 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:04,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:04,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:04,418 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:04,424 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:04,424 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:04,424 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,430 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:04,473 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:04,521 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:04,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c253fa0> has no local changes
2024-04-06 00:46:04,529 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:04,538 [ scc.git] DEBUG [detached HEAD ae900e4] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:04,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:04,539 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:04,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-06 00:46:04,828 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:04,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-06 00:46:04,828 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:04,839 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:04,840 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:04,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:04,852 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:04,852 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:04,852 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,859 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:04,903 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:04,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:04,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:04,957 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:04,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c23dcd0> has no local changes
2024-04-06 00:46:04,964 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:04,973 [ scc.git] DEBUG [detached HEAD ba90f4b] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:04,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:04,973 [ scc.git] INFO Overriding base-branch from master to main
2024-04-06 00:46:04,973 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:05,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-06 00:46:05,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-06 00:46:06,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-06 00:46:06,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-06 00:46:07,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-06 00:46:07,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:46:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-06 00:46:08,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-06 00:46:09,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:46:09,069 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-06 00:46:09,069 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:09,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-06 00:46:09,069 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:09,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:09,076 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-06 00:46:09,083 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:09,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-06 00:46:09,090 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-06 00:46:09,097 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:09,097 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-06 00:46:09,518 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-06 00:46:09,519 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-06 00:46:09,524 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:09,524 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:09,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:09,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-06 00:46:09,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:09,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-06 00:46:09,598 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-06 00:46:09,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-06 00:46:09,598 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:46:09,598 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:46:09,604 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-06 00:46:09,610 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-06 00:46:09,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:09,777 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-06 00:46:09,783 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-06 00:46:09,789 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-06 00:46:09,794 [ scc.config] DEBUG Found github.token
2024-04-06 00:46:09,794 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-06 00:46:09,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:09,834 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:09,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:09,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:09,876 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:09,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c23a430> has no local changes
2024-04-06 00:46:09,883 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:09,891 [ scc.git] DEBUG [detached HEAD 71864a3] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:09,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:09,892 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:10,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-06 00:46:10,201 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:10,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-06 00:46:10,202 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:10,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:10,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:10,219 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:10,226 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:10,227 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:10,227 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,232 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:10,271 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,277 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:10,316 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:10,323 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c222e50> has no local changes
2024-04-06 00:46:10,323 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:10,331 [ scc.git] DEBUG [detached HEAD 5d8846b] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:10,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:10,332 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:10,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-06 00:46:10,638 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:10,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-06 00:46:10,638 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:10,649 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:10,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:10,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:10,662 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:10,662 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:10,662 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,667 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:10,707 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:10,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:10,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:10,752 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:10,759 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c1ba940> has no local changes
2024-04-06 00:46:10,759 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:10,767 [ scc.git] DEBUG [detached HEAD 575edfc] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:10,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:10,768 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:11,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-06 00:46:11,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-06 00:46:12,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-06 00:46:12,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-06 00:46:12,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:46:13,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-06 00:46:13,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:46:13,855 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-06 00:46:13,855 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:13,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-06 00:46:13,855 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:13,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:13,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-06 00:46:13,867 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:13,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-06 00:46:13,874 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-06 00:46:13,880 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:13,880 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-06 00:46:14,389 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-06 00:46:14,389 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-06 00:46:14,396 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:14,397 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:14,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:14,404 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-06 00:46:14,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:14,415 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-06 00:46:14,448 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-06 00:46:14,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-06 00:46:14,448 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:46:14,449 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:46:14,458 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-06 00:46:14,471 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-06 00:46:14,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:14,611 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-06 00:46:14,618 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-06 00:46:14,626 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-06 00:46:14,633 [ scc.config] DEBUG Found github.token
2024-04-06 00:46:14,634 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-06 00:46:14,634 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:14,687 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:14,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:14,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:14,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:14,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c1c39d0> has no local changes
2024-04-06 00:46:14,750 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:14,761 [ scc.git] DEBUG [detached HEAD dab044e] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:14,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:14,761 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-06 00:46:14,761 [ scc.repo] DEBUG ## PRs found:
2024-04-06 00:46:15,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-06 00:46:15,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-06 00:46:16,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-06 00:46:16,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-06 00:46:17,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-06 00:46:17,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-06 00:46:18,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-06 00:46:18,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-06 00:46:18,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-06 00:46:19,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-06 00:46:19,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-06 00:46:19,789 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-06 00:46:20,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-06 00:46:20,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-06 00:46:21,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-06 00:46:21,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-06 00:46:21,683 [ scc.repo] DEBUG ## Branches found:
2024-04-06 00:46:21,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-06 00:46:21,683 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:21,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:21,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-06 00:46:21,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-06 00:46:21,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-06 00:46:21,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-06 00:46:21,706 [ scc.git] DEBUG Already up to date.
2024-04-06 00:46:21,706 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-06 00:46:22,137 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-06 00:46:22,137 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-06 00:46:22,143 [ scc.git] DEBUG ## Unique users: []
2024-04-06 00:46:22,143 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:22,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:22,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-06 00:46:22,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:22,162 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-06 00:46:22,206 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-06 00:46:22,206 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-06 00:46:22,206 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-06 00:46:22,207 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-06 00:46:22,213 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-06 00:46:22,219 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-06 00:46:22,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:22,384 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-06 00:46:22,393 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-06 00:46:22,401 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#23](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-06 00:46:22,407 [ scc.config] DEBUG Found github.token
2024-04-06 00:46:22,407 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-06 00:46:22,408 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-06 00:46:22,455 [ scc.git] DEBUG Get sha1 of %s
2024-04-06 00:46:22,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-06 00:46:22,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:22,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:22,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738c1babb0> has no local changes
2024-04-06 00:46:22,512 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:22,522 [ scc.git] DEBUG [detached HEAD a3f3fb4] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:22,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:22,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-06 00:46:22,606 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-06 00:46:22,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:22,793 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-06 00:46:22,798 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-06 00:46:23,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:23,203 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-06 00:46:23,209 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-06 00:46:23,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:23,610 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-06 00:46:23,616 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-06 00:46:24,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:24,022 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-06 00:46:24,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:24,421 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-06 00:46:24,426 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-06 00:46:24,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:24,823 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-06 00:46:24,829 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-06 00:46:25,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:25,231 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-06 00:46:25,237 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-06 00:46:25,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:25,645 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-06 00:46:25,651 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-06 00:46:26,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:26,058 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-06 00:46:26,064 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-06 00:46:26,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:26,484 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-06 00:46:26,489 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-06 00:46:26,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:26,898 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-06 00:46:26,905 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-06 00:46:27,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:27,296 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-06 00:46:27,303 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-06 00:46:27,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:27,701 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-06 00:46:28,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:28,109 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-06 00:46:28,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:28,504 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-06 00:46:28,509 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-06 00:46:28,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:28,915 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-06 00:46:29,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:29,317 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-06 00:46:29,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:29,710 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-06 00:46:29,715 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-06 00:46:30,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:30,129 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-06 00:46:30,134 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-06 00:46:30,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:30,529 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-06 00:46:30,535 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-06 00:46:30,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:30,953 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-06 00:46:30,960 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-06 00:46:31,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-06 00:46:31,359 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-06 00:46:31,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-06 00:46:31,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f738d436ac0> has local changes
2024-04-06 00:46:31,439 [ 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#23 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/23/)'
2024-04-06 00:46:31,454 [ scc.git] DEBUG [detached HEAD 35edc05] merge master -Dorg -Ssuccess-only
2024-04-06 00:46:31,454 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-06 00:46:31,454 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-06 00:46:31,454 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,454 [ scc.merge] INFO
2024-04-06 00:46:31,454 [ scc.merge] INFO
2024-04-06 00:46:31,454 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-06 00:46:31,454 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,454 [ scc.merge] INFO
2024-04-06 00:46:31,454 [ scc.merge] INFO
2024-04-06 00:46:31,454 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-06 00:46:31,454 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,454 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-06 00:46:31,454 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,454 [ scc.merge] INFO
2024-04-06 00:46:31,454 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-06 00:46:31,455 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-06 00:46:31,455 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-06 00:46:31,455 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-06 00:46:31,455 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,455 [ scc.merge] INFO
2024-04-06 00:46:31,455 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,455 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-06 00:46:31,456 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-06 00:46:31,456 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-06 00:46:31,456 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-06 00:46:31,456 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-06 00:46:31,456 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-06 00:46:31,456 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,456 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,456 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-06 00:46:31,456 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-06 00:46:31,457 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-06 00:46:31,457 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-06 00:46:31,457 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-06 00:46:31,457 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-06 00:46:31,457 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-06 00:46:31,457 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,457 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-06 00:46:31,457 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,457 [ scc.merge] INFO
2024-04-06 00:46:31,457 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,458 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Merged PRs:
2024-04-06 00:46:31,458 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-06 00:46:31,458 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,458 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,458 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-06 00:46:31,458 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,458 [ scc.merge] INFO
2024-04-06 00:46:31,458 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,458 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-06 00:46:31,459 [ scc.merge] INFO
2024-04-06 00:46:31,459 [ scc.merge] INFO Repository: ome/scripts
2024-04-06 00:46:31,459 [ scc.merge] INFO Excluded PRs:
2024-04-06 00:46:31,459 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-06 00:46:31,459 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-06 00:46:31,459 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-06 00:46:31,459 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-06 00:46:31,459 [ scc.merge] INFO Already up to date.
2024-04-06 00:46:31,459 [ scc.merge] INFO
2024-04-06 00:46:31,459 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-06 00:46:31,459 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-06 00:46:31,459 [ scc.merge] INFO
2024-04-06 00:46:31,459 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-06 00:46:31,459 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-06 00:46:31,465 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-06 00:46:31,471 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-06 00:46:31,476 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-06 00:46:31,480 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-06 00:46:31,485 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-06 00:46:31,490 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-06 00:46:31,495 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-06 00:46:31,499 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-06 00:46:31,504 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-06 00:46:31,509 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-06 00:46:31,514 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-06 00:46:31,519 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-06 00:46:31,524 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-06 00:46:31,529 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-06 00:46:31,534 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-06 00:46:31,540 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-06 00:46:31,545 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-06 00:46:31,550 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-06 00:46:31,555 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-06 00:46:31,560 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-06 00:46:31,566 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-06 00:46:31,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-06 00:46:31,570 [ scc.git] DEBUG Calling 'git remote'
2024-04-06 00:46:31,575 [ 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 2ac2927] 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 e7a3405] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-06 00:47:17,068 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-04-06 00:47:26,011 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-04-06 00:47:28,355 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-06 00:47:32,838 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-06 00:48:23,634 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
