Skipping 124 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-09 00:45:24,065 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-09 00:45:24,065 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-09 00:45:24,066 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-09 00:45:24,066 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-09 00:45:24,066 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-09 00:45:24,066 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-09 00:45:24,067 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-09 00:45:24,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:24,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-09 00:45:24,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:24,233 [ 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-09 00:45:24,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:24,289 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-09 00:45:24,289 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-09 00:45:24,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:24,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1d2e4ee2e47332b85e73002f68a4bb9de5ee6930'
2024-04-09 00:45:24,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:24,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 551 (bump nodejs) 1d2e4ee2e47332b85e73002f68a4bb9de5ee6930'
2024-04-09 00:45:24,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:24,675 [ scc.git] DEBUG .omeroci/app-deps | 4 ++--
2024-04-09 00:45:24,675 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2024-04-09 00:45:25,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:25,046 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:45:25,085 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:25,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:25,091 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:45:25,129 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:45:25,140 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a6908be0> has no local changes
2024-04-09 00:45:25,140 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 550 will-moore 'Don't update zoom to undefined on setId' (status: failure)
- PR 549 will-moore 'Inset feature' (stage: draft)
- 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'
- PR 551 jburel 'bump nodejs'
Generated by OMERO-plugins-push#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:45:25,150 [ scc.git] DEBUG [detached HEAD 4bda9bfc] merge master -Dorg -Ssuccess-only
2024-04-09 00:45:25,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:45:25,151 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:45:25,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-09 00:45:25,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-09 00:45:26,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-09 00:45:26,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-09 00:45:27,462 [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-09 00:45:27,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-09 00:45:28,388 [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-09 00:45:28,388 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-09 00:45:28,389 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:45:28,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-09 00:45:28,389 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:28,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:28,395 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:45:28,402 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:45:28,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:45:28,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:45:28,417 [ scc.git] DEBUG Already up to date.
2024-04-09 00:45:28,417 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-09 00:45:28,829 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-09 00:45:28,829 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-09 00:45:28,835 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:45:28,835 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:28,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:28,841 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-09 00:45:28,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:28,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-09 00:45:28,882 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-09 00:45:28,883 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:28,886 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-09 00:45:28,886 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-09 00:45:29,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:29,046 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:45:29,107 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:29,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:29,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:45:29,164 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:45:29,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a586c550> has no local changes
2024-04-09 00:45:29,174 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:45:29,185 [ scc.git] DEBUG [detached HEAD bfa2903] merge master -Dorg -Ssuccess-only
2024-04-09 00:45:29,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:45:29,186 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:45:29,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-09 00:45:30,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-09 00:45:30,035 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:45:30,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-09 00:45:31,066 [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-09 00:45:31,572 [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-09 00:45:32,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-09 00:45:32,580 [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-09 00:45:32,581 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-09 00:45:32,581 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:45:32,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-09 00:45:32,581 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:32,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:32,593 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:45:32,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:45:32,605 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:45:32,616 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:45:32,623 [ scc.git] DEBUG Already up to date.
2024-04-09 00:45:32,623 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-09 00:45:33,018 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-09 00:45:33,018 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-09 00:45:33,026 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:45:33,027 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:33,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:33,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-09 00:45:33,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:33,046 [ 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-09 00:45:33,056 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:33,060 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-09 00:45:33,060 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-09 00:45:33,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:33,220 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:45:33,261 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:33,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:33,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:45:33,305 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:45:33,313 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a58599d0> has no local changes
2024-04-09 00:45:33,313 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:45:33,322 [ scc.git] DEBUG [detached HEAD 18d2f59] merge master -Dorg -Ssuccess-only
2024-04-09 00:45:33,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:45:33,323 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:45:33,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-09 00:45:34,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-09 00:45:34,258 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:45:34,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-09 00:45:35,349 [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-09 00:45:35,878 [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-09 00:45:36,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-09 00:45:36,753 [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-09 00:45:36,754 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-09 00:45:37,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-09 00:45:37,217 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:45:37,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-09 00:45:38,277 [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-09 00:45:38,745 [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-09 00:45:39,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-09 00:45:39,710 [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-09 00:45:39,710 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-09 00:45:40,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-09 00:45:40,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-09 00:45:41,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-09 00:45:41,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-09 00:45:42,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-09 00:45:42,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-09 00:45:42,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/efda99710532f9743896717e88f0e68ca23ec3b2?per_page=1 HTTP/1.1" 200 2
2024-04-09 00:45:42,972 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-09 00:45:43,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-09 00:45:43,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-09 00:45:44,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-09 00:45:44,945 [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-09 00:45:45,395 [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-09 00:45:45,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-09 00:45:46,360 [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-09 00:45:46,361 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-09 00:45:46,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-09 00:45:47,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-09 00:45:47,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-09 00:45:48,333 [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-09 00:45:48,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-09 00:45:49,246 [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-09 00:45:49,247 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-09 00:45:49,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-09 00:45:50,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-09 00:45:50,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-09 00:45:51,221 [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-09 00:45:51,702 [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-09 00:45:52,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-09 00:45:52,606 [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-09 00:45:52,607 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-09 00:45:52,607 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:45:52,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-09 00:45:52,608 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:52,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:52,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:45:52,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:45:52,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:45:52,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:45:52,630 [ scc.git] DEBUG Already up to date.
2024-04-09 00:45:52,630 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-09 00:45:53,146 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:53,146 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-09 00:45:53,151 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-09 00:45:53,612 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:53,612 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-09 00:45:53,618 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-09 00:45:54,094 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:54,094 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-09 00:45:54,100 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-09 00:45:55,104 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:55,104 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-09 00:45:55,107 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-09 00:45:55,492 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:55,492 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-09 00:45:55,497 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-09 00:45:55,870 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-09 00:45:55,870 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-09 00:45:55,874 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:45:55,874 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:55,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:55,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-09 00:45:55,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:55,892 [ 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-09 00:45:55,917 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:55,920 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-09 00:45:55,920 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-09 00:45:56,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:56,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-09 00:45:56,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:56,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-09 00:45:56,122 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:56,126 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-09 00:45:56,126 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-09 00:45:56,126 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-09 00:45:56,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:56,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-09 00:45:56,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:56,518 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-09 00:45:56,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:56,544 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-09 00:45:56,544 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-09 00:45:56,544 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-09 00:45:56,544 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-09 00:45:56,544 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-09 00:45:56,545 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-09 00:45:56,545 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-09 00:45:56,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:56,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-09 00:45:56,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:56,927 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-09 00:45:56,970 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-09 00:45:56,971 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:56,975 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-09 00:45:56,976 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-09 00:45:56,976 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-09 00:45:56,976 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-09 00:45:56,976 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-09 00:45:56,976 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-09 00:45:56,976 [ scc.git] DEBUG 6 files changed, 284 insertions(+), 6 deletions(-)
2024-04-09 00:45:56,976 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-09 00:45:57,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:57,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-09 00:45:57,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:57,408 [ 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-09 00:45:57,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:57,450 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-09 00:45:57,450 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-09 00:45:57,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:57,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-09 00:45:57,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:57,787 [ 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-09 00:45:57,930 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-09 00:45:57,931 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:45:57,942 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-09 00:45:57,942 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-09 00:45:58,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:45:58,161 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:45:58,206 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:45:58,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:45:58,213 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:45:58,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:45:58,267 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a58515b0> has no local changes
2024-04-09 00:45:58,267 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:45:58,277 [ scc.git] DEBUG [detached HEAD 9573a00] merge master -Dorg -Ssuccess-only
2024-04-09 00:45:58,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:45:58,278 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:45:58,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-09 00:45:59,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-09 00:45:59,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-09 00:46:00,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-09 00:46:00,631 [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-09 00:46:01,088 [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-09 00:46:01,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-09 00:46:01,978 [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-09 00:46:01,979 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-09 00:46:01,979 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:01,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-09 00:46:01,979 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:01,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:01,984 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:01,989 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:01,990 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:01,995 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:02,002 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:02,003 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-09 00:46:02,429 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-09 00:46:02,429 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-09 00:46:02,435 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:02,435 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:02,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:02,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-09 00:46:02,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:02,456 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-09 00:46:02,468 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:02,471 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-09 00:46:02,471 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-09 00:46:02,471 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-09 00:46:02,471 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-09 00:46:02,471 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-09 00:46:02,471 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-09 00:46:02,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:02,625 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:02,666 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:02,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:02,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:02,724 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:02,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a68b74f0> has no local changes
2024-04-09 00:46:02,732 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:02,743 [ scc.git] DEBUG [detached HEAD 35188eb] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:02,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:02,743 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:03,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-09 00:46:03,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-09 00:46:04,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-09 00:46:04,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-09 00:46:05,108 [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-09 00:46:05,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-09 00:46:06,031 [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-09 00:46:06,032 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-09 00:46:06,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-09 00:46:06,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-09 00:46:07,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-09 00:46:07,927 [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-09 00:46:08,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-09 00:46:08,852 [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-09 00:46:08,853 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-09 00:46:08,853 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:08,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-09 00:46:08,854 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:08,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:08,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:08,869 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:08,870 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:08,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:08,892 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:08,892 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-09 00:46:09,433 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-09 00:46:09,433 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-09 00:46:09,439 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-09 00:46:10,012 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-09 00:46:10,013 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-09 00:46:10,021 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:10,021 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:10,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:10,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-09 00:46:10,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:10,053 [ 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-09 00:46:10,177 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-09 00:46:10,178 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-09 00:46:10,178 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-09 00:46:10,178 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-09 00:46:10,178 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:10,179 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:10,190 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-09 00:46:10,202 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-09 00:46:10,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:10,377 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-09 00:46:10,384 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-09 00:46:10,392 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-09 00:46:10,397 [ scc.config] DEBUG Found github.token
2024-04-09 00:46:10,398 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-09 00:46:10,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-09 00:46:10,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:10,411 [ 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-09 00:46:10,430 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-09 00:46:10,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-09 00:46:10,431 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-09 00:46:10,431 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:10,436 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:10,446 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-09 00:46:10,456 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-09 00:46:10,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:10,812 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-09 00:46:10,819 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-09 00:46:10,824 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/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-09 00:46:10,829 [ scc.config] DEBUG Found github.token
2024-04-09 00:46:10,829 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-09 00:46:10,829 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:10,866 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:10,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:10,871 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:10,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:10,916 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a5851550> has no local changes
2024-04-09 00:46:10,917 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:10,926 [ scc.git] DEBUG [detached HEAD 422d017] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:10,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:10,927 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:11,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-09 00:46:11,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-09 00:46:11,851 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:46:12,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-09 00:46:12,936 [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-09 00:46:13,388 [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-09 00:46:13,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-09 00:46:14,328 [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-09 00:46:14,329 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-09 00:46:14,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-09 00:46:14,810 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:46:15,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-09 00:46:15,820 [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-09 00:46:16,334 [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-09 00:46:16,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-09 00:46:17,241 [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-09 00:46:17,242 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-09 00:46:17,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-09 00:46:17,700 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-09 00:46:18,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-09 00:46:18,800 [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-09 00:46:19,293 [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-09 00:46:19,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-09 00:46:20,293 [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-09 00:46:20,294 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-09 00:46:20,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-09 00:46:21,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-09 00:46:21,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-09 00:46:22,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-09 00:46:22,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-09 00:46:23,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-09 00:46:23,169 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:23,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-09 00:46:23,169 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:23,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:23,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:23,182 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:23,182 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:23,188 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:23,194 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:23,194 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-09 00:46:23,559 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-09 00:46:23,559 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-09 00:46:23,564 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-09 00:46:23,953 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-09 00:46:23,954 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-09 00:46:23,960 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-09 00:46:24,352 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-09 00:46:24,352 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-09 00:46:24,357 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:24,357 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:24,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:24,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-09 00:46:24,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:24,375 [ 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-09 00:46:24,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:24,388 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-09 00:46:24,388 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-09 00:46:24,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:24,561 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-09 00:46:24,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:24,573 [ 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-09 00:46:24,623 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-09 00:46:24,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:24,627 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-09 00:46:24,627 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-09 00:46:24,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:24,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-09 00:46:24,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:24,986 [ 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-09 00:46:25,091 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-09 00:46:25,092 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:25,097 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-09 00:46:25,097 [ scc.git] DEBUG package.json | 2 +-
2024-04-09 00:46:25,097 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-09 00:46:25,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:25,390 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:25,428 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:25,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:25,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:25,471 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:25,478 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a584ffd0> has no local changes
2024-04-09 00:46:25,478 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:25,487 [ scc.git] DEBUG [detached HEAD e8d6bcc] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:25,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:25,488 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:25,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-09 00:46:26,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-09 00:46:26,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-09 00:46:27,348 [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-09 00:46:27,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-09 00:46:28,288 [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-09 00:46:28,289 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-09 00:46:28,289 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:28,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-09 00:46:28,289 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:28,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:28,296 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:28,301 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:28,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:28,309 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:28,316 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:28,316 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-09 00:46:28,689 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-09 00:46:28,690 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-09 00:46:28,694 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:28,694 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:28,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:28,701 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-09 00:46:28,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:28,713 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-09 00:46:28,721 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:28,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:28,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:28,923 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:28,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:28,930 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:28,969 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:28,976 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4847cb340> has no local changes
2024-04-09 00:46:28,976 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:28,985 [ scc.git] DEBUG [detached HEAD 2eae684] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:28,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:28,985 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:29,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-09 00:46:29,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-09 00:46:30,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-09 00:46:30,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-09 00:46:31,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-09 00:46:31,741 [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-09 00:46:32,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-09 00:46:32,651 [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-09 00:46:32,652 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-09 00:46:32,652 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:32,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-09 00:46:32,652 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:32,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:32,659 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:32,664 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:32,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:32,670 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:32,676 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:32,676 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-09 00:46:33,212 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-09 00:46:33,212 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-09 00:46:33,217 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:33,217 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:33,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:33,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-09 00:46:33,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:33,235 [ 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-09 00:46:33,245 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-09 00:46:33,245 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:33,248 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-09 00:46:33,248 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-09 00:46:33,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:33,414 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:33,455 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:33,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:33,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:33,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:33,505 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a40405b0> has no local changes
2024-04-09 00:46:33,505 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:33,514 [ scc.git] DEBUG [detached HEAD 2f49b89] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:33,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:33,515 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:33,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-09 00:46:34,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-09 00:46:34,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-09 00:46:35,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-09 00:46:35,859 [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-09 00:46:36,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-09 00:46:36,812 [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-09 00:46:36,813 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-09 00:46:36,813 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:36,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-09 00:46:36,813 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:36,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:36,820 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:36,825 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:36,825 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:36,831 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:36,837 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:36,837 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-09 00:46:37,252 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-09 00:46:37,253 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-09 00:46:37,257 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:37,257 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:37,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:37,264 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-09 00:46:37,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:37,276 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-09 00:46:37,307 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-09 00:46:37,307 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-09 00:46:37,307 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-09 00:46:37,307 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-09 00:46:37,307 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-09 00:46:37,308 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-09 00:46:37,308 [ scc.git] DEBUG Auto-merging setup.py
2024-04-09 00:46:37,308 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-09 00:46:37,308 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:37,308 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:37,314 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-09 00:46:37,320 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-09 00:46:37,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:37,473 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-09 00:46:37,479 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-09 00:46:37,484 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-04-09 00:46:37,490 [ scc.config] DEBUG Found github.token
2024-04-09 00:46:37,490 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-09 00:46:37,490 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:37,528 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:37,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:37,533 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:37,572 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:37,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a5859e80> has no local changes
2024-04-09 00:46:37,578 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:37,587 [ scc.git] DEBUG [detached HEAD a04a346] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:37,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:37,588 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:37,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-09 00:46:38,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-09 00:46:39,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-09 00:46:39,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-09 00:46:39,981 [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-09 00:46:40,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-09 00:46:40,912 [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-09 00:46:40,913 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-09 00:46:40,913 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:40,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-09 00:46:40,913 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:40,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:40,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:40,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:40,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:40,932 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:40,938 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:40,939 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-09 00:46:41,384 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-09 00:46:41,384 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-09 00:46:41,389 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:41,389 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:41,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:41,396 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-09 00:46:41,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:41,411 [ 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-09 00:46:41,434 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-09 00:46:41,437 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-09 00:46:41,438 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-09 00:46:41,440 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-09 00:46:41,440 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-09 00:46:41,440 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-09 00:46:41,440 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-09 00:46:41,440 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-09 00:46:41,440 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-09 00:46:41,440 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-09 00:46:41,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-09 00:46:41,442 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-09 00:46:41,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:41,601 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:41,642 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:41,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:41,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:41,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:41,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a584fdf0> has no local changes
2024-04-09 00:46:41,699 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:41,734 [ scc.git] DEBUG [detached HEAD c0b3c3e] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:41,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:41,735 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:42,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-09 00:46:42,024 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:42,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-09 00:46:42,024 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,032 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:42,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:42,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:42,044 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:42,051 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:42,051 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:42,051 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,057 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:42,098 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:42,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:42,149 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a4030fa0> has no local changes
2024-04-09 00:46:42,150 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:42,170 [ scc.git] DEBUG [detached HEAD f948787] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:42,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:42,170 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:42,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-09 00:46:42,481 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:42,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-09 00:46:42,481 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:42,492 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:42,492 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:42,497 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:42,503 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:42,503 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:42,503 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,508 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:42,545 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:42,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:42,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:42,588 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:42,595 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4847e9f70> has no local changes
2024-04-09 00:46:42,595 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:42,604 [ scc.git] DEBUG [detached HEAD 7d1f277] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:42,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:42,604 [ scc.git] INFO Overriding base-branch from master to main
2024-04-09 00:46:42,605 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:42,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-09 00:46:43,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-09 00:46:43,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-09 00:46:44,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-09 00:46:44,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-09 00:46:45,329 [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-09 00:46:45,824 [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-09 00:46:46,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-09 00:46:46,765 [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-09 00:46:46,766 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-09 00:46:46,766 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:46,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-09 00:46:46,767 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:46,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:46,774 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-09 00:46:46,783 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:46,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-09 00:46:46,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-09 00:46:46,796 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:46,796 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-09 00:46:47,251 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-09 00:46:47,251 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-09 00:46:47,256 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:47,256 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:47,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:47,262 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-09 00:46:47,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:47,272 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-09 00:46:47,300 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-09 00:46:47,301 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-09 00:46:47,301 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:47,301 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:47,307 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-09 00:46:47,312 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-09 00:46:47,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:47,483 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-09 00:46:47,489 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-09 00:46:47,494 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-09 00:46:47,498 [ scc.config] DEBUG Found github.token
2024-04-09 00:46:47,499 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-09 00:46:47,499 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:47,537 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:47,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:47,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:47,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:47,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4847d9430> has no local changes
2024-04-09 00:46:47,589 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:47,597 [ scc.git] DEBUG [detached HEAD 93fbaf1] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:47,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:47,598 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:47,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-09 00:46:47,941 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:47,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-09 00:46:47,942 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:47,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:47,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:47,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:47,955 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:47,961 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:47,966 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:47,966 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:47,967 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:47,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:47,971 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:48,013 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:48,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:48,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:48,059 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:48,067 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4847dcc10> has no local changes
2024-04-09 00:46:48,067 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:48,076 [ scc.git] DEBUG [detached HEAD e049c1e] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:48,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:48,076 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:48,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-09 00:46:48,369 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:48,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-09 00:46:48,369 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:48,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:48,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:48,381 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:48,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:48,386 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:48,391 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:48,392 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:48,392 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:48,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:48,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:48,439 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:48,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:48,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:48,485 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:48,491 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc48476b940> has no local changes
2024-04-09 00:46:48,491 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:48,500 [ scc.git] DEBUG [detached HEAD 454da29] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:48,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:48,500 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:48,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-09 00:46:49,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-09 00:46:49,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-09 00:46:50,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-09 00:46:50,754 [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-09 00:46:51,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-09 00:46:51,649 [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-09 00:46:51,650 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-09 00:46:51,650 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:51,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-09 00:46:51,650 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:51,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:51,656 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-09 00:46:51,661 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:51,661 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-09 00:46:51,666 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-09 00:46:51,671 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:51,672 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-09 00:46:52,112 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-09 00:46:52,112 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-09 00:46:52,117 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:52,117 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:52,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:52,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-09 00:46:52,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:52,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-09 00:46:52,186 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-09 00:46:52,186 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-09 00:46:52,186 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:52,187 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:52,193 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-09 00:46:52,200 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-09 00:46:52,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:46:52,364 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-09 00:46:52,371 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-09 00:46:52,377 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-09 00:46:52,383 [ scc.config] DEBUG Found github.token
2024-04-09 00:46:52,383 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-09 00:46:52,383 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:46:52,425 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:52,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:52,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:46:52,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:46:52,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc484776d60> has no local changes
2024-04-09 00:46:52,480 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:46:52,489 [ scc.git] DEBUG [detached HEAD 1aa6fa0] merge master -Dorg -Ssuccess-only
2024-04-09 00:46:52,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:46:52,490 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-09 00:46:52,490 [ scc.repo] DEBUG ## PRs found:
2024-04-09 00:46:52,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-09 00:46:53,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-09 00:46:53,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-09 00:46:54,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-09 00:46:54,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-09 00:46:55,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-09 00:46:55,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-09 00:46:56,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-09 00:46:56,675 [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-09 00:46:57,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-09 00:46:57,529 [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-09 00:46:57,530 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-09 00:46:58,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-09 00:46:58,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-09 00:46:58,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-09 00:46:59,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-09 00:46:59,459 [ scc.repo] DEBUG ## Branches found:
2024-04-09 00:46:59,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-09 00:46:59,459 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:59,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:59,465 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-09 00:46:59,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-09 00:46:59,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-09 00:46:59,475 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-09 00:46:59,481 [ scc.git] DEBUG Already up to date.
2024-04-09 00:46:59,481 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-09 00:46:59,915 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-09 00:46:59,915 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-09 00:46:59,920 [ scc.git] DEBUG ## Unique users: []
2024-04-09 00:46:59,921 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:46:59,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:59,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-09 00:46:59,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:46:59,941 [ 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-09 00:46:59,989 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-09 00:46:59,989 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-09 00:46:59,989 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-09 00:46:59,989 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-09 00:46:59,996 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-09 00:47:00,003 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-09 00:47:00,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:00,158 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-09 00:47:00,166 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-09 00:47:00,172 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#26](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-09 00:47:00,177 [ scc.config] DEBUG Found github.token
2024-04-09 00:47:00,177 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-09 00:47:00,177 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-09 00:47:00,219 [ scc.git] DEBUG Get sha1 of %s
2024-04-09 00:47:00,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-09 00:47:00,225 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:47:00,265 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:47:00,272 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc48476bbb0> has no local changes
2024-04-09 00:47:00,272 [ 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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:47:00,281 [ scc.git] DEBUG [detached HEAD 913e34b] merge master -Dorg -Ssuccess-only
2024-04-09 00:47:00,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:00,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-09 00:47:00,360 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-09 00:47:00,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:00,596 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-09 00:47:00,600 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-09 00:47:01,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:01,016 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-09 00:47:01,021 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-09 00:47:01,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:01,427 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-09 00:47:01,431 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-09 00:47:01,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:01,831 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-09 00:47:02,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:02,229 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-09 00:47:02,233 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-09 00:47:02,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:02,647 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-09 00:47:02,652 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-09 00:47:03,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:03,080 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-09 00:47:03,085 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-09 00:47:03,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:03,486 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-09 00:47:03,490 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-09 00:47:03,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:03,905 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-09 00:47:03,909 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-09 00:47:04,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:04,322 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-09 00:47:04,328 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-09 00:47:04,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:04,740 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-09 00:47:04,744 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-09 00:47:05,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:05,156 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-09 00:47:05,160 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-09 00:47:05,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:05,562 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-09 00:47:05,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:05,974 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-09 00:47:06,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:06,422 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-09 00:47:06,427 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-09 00:47:06,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:06,841 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-09 00:47:07,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:07,249 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-09 00:47:07,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:07,655 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-09 00:47:07,660 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-09 00:47:08,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:08,059 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-09 00:47:08,064 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-09 00:47:08,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:08,472 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-09 00:47:08,476 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-09 00:47:08,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:08,890 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-09 00:47:08,895 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-09 00:47:09,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-09 00:47:09,359 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-09 00:47:09,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-09 00:47:09,435 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc4a79fcac0> has local changes
2024-04-09 00:47:09,435 [ 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 550 will-moore 'Don't update zoom to undefined on setId' (status: failure)
- PR 549 will-moore 'Inset feature' (stage: draft)
- 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'
- PR 551 jburel 'bump nodejs'
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#26 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/26/)'
2024-04-09 00:47:09,449 [ scc.git] DEBUG [detached HEAD 9cedc72] merge master -Dorg -Ssuccess-only
2024-04-09 00:47:09,449 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-09 00:47:09,449 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-09 00:47:09,449 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,449 [ scc.merge] INFO
2024-04-09 00:47:09,449 [ scc.merge] INFO
2024-04-09 00:47:09,449 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-09 00:47:09,449 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,449 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-09 00:47:09,450 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-09 00:47:09,450 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-09 00:47:09,450 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-09 00:47:09,450 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-09 00:47:09,450 [ scc.merge] INFO
2024-04-09 00:47:09,450 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-09 00:47:09,450 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 550 will-moore 'Don't update zoom to undefined on setId' (status: failure)
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-09 00:47:09,450 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-09 00:47:09,451 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 551 jburel 'bump nodejs'
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-09 00:47:09,451 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-09 00:47:09,451 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-09 00:47:09,451 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-09 00:47:09,451 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-09 00:47:09,451 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,451 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-09 00:47:09,451 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,451 [ scc.merge] INFO
2024-04-09 00:47:09,451 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-09 00:47:09,452 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-09 00:47:09,452 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-09 00:47:09,452 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-09 00:47:09,452 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-09 00:47:09,452 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-09 00:47:09,452 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,452 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-09 00:47:09,452 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,452 [ scc.merge] INFO
2024-04-09 00:47:09,452 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,453 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Merged PRs:
2024-04-09 00:47:09,453 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-09 00:47:09,453 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,453 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,453 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO
2024-04-09 00:47:09,453 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-09 00:47:09,453 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,454 [ scc.merge] INFO
2024-04-09 00:47:09,454 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-09 00:47:09,454 [ scc.merge] INFO
2024-04-09 00:47:09,454 [ scc.merge] INFO Repository: ome/scripts
2024-04-09 00:47:09,454 [ scc.merge] INFO Excluded PRs:
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-09 00:47:09,454 [ scc.merge] INFO Already up to date.
2024-04-09 00:47:09,454 [ scc.merge] INFO
2024-04-09 00:47:09,454 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-09 00:47:09,454 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-09 00:47:09,454 [ scc.merge] INFO
2024-04-09 00:47:09,454 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-09 00:47:09,454 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-09 00:47:09,460 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-09 00:47:09,466 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-09 00:47:09,472 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-09 00:47:09,477 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-09 00:47:09,482 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-09 00:47:09,486 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-09 00:47:09,491 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-09 00:47:09,495 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-09 00:47:09,500 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-09 00:47:09,505 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-09 00:47:09,509 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-09 00:47:09,514 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-09 00:47:09,518 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-09 00:47:09,523 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-09 00:47:09,527 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-09 00:47:09,532 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-09 00:47:09,536 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-09 00:47:09,541 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-09 00:47:09,545 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-09 00:47:09,550 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-09 00:47:09,555 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-09 00:47:09,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-09 00:47:09,560 [ scc.git] DEBUG Calling 'git remote'
2024-04-09 00:47:09,564 [ 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 d6a466f] 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 aded651] 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-09 00:47:55,621 [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-09 00:48:04,697 [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-09 00:48:07,048 [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-09 00:48:11,633 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-09 00:48:58,491 [ 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}
