Console Output
Skipping 93 KB..
Full Log2024-08-09 00:44:01,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-09 00:44:02,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-09 00:44:02,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-09 00:44:03,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-09 00:44:03,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:03,689 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-09 00:44:03,691 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:03,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-09 00:44:03,691 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:03,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:03,752 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:03,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:03,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:03,774 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:03,782 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:03,782 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-09 00:44:04,167 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-09 00:44:04,167 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-09 00:44:04,176 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-09 00:44:04,752 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-09 00:44:04,752 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-09 00:44:04,761 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-09 00:44:05,837 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-09 00:44:05,838 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-09 00:44:05,851 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-09 00:44:06,211 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-09 00:44:06,211 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-09 00:44:06,219 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-09 00:44:06,751 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-09 00:44:06,752 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-09 00:44:06,761 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:06,761 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:06,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:06,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-09 00:44:06,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:06,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-09 00:44:06,891 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-09 00:44:06,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-09 00:44:06,904 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-09 00:44:06,904 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-09 00:44:07,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:07,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-09 00:44:07,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:07,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-09 00:44:07,283 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-09 00:44:07,283 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-09 00:44:07,283 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-09 00:44:07,283 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-09 00:44:07,284 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:07,293 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-09 00:44:07,293 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-09 00:44:07,293 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-09 00:44:07,293 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-09 00:44:07,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:07,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-09 00:44:07,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:07,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-09 00:44:07,851 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-09 00:44:07,852 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-09 00:44:07,852 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-09 00:44:07,852 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-09 00:44:07,852 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-09 00:44:07,852 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-09 00:44:07,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:07,862 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-09 00:44:07,862 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-09 00:44:07,862 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/index.html | 1 +
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-09 00:44:07,862 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-09 00:44:07,863 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-09 00:44:07,863 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-09 00:44:07,866 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-09 00:44:08,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:08,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-09 00:44:08,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:08,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-09 00:44:08,070 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:08,075 [ scc.git] DEBUG setup.py | 2 +-
2024-08-09 00:44:08,075 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-09 00:44:08,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:08,402 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-09 00:44:08,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:08,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-09 00:44:08,528 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-09 00:44:08,528 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-09 00:44:08,530 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:08,536 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-09 00:44:08,536 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-09 00:44:08,536 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-09 00:44:08,536 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-09 00:44:08,536 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-09 00:44:08,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:08,783 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:08,867 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:08,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:08,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:08,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:08,934 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f41a84f0> has no local changes
2024-08-09 00:44:08,935 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:08,947 [ scc.git] DEBUG [detached HEAD 4b411bbb] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:08,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:08,947 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:09,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-09 00:44:09,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-09 00:44:10,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-09 00:44:10,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-09 00:44:11,303 [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-08-09 00:44:11,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-09 00:44:12,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:12,255 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-09 00:44:12,256 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:12,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-09 00:44:12,256 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:12,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:12,270 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:12,278 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:12,279 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:12,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:12,297 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:12,298 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-09 00:44:12,652 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-09 00:44:12,652 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-09 00:44:12,661 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:12,661 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:12,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:12,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-09 00:44:12,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:12,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-09 00:44:12,735 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-09 00:44:12,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:12,742 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-09 00:44:12,742 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-09 00:44:12,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:12,881 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:12,943 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:12,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:12,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:13,010 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:13,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f4181220> has no local changes
2024-08-09 00:44:13,022 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:13,034 [ scc.git] DEBUG [detached HEAD 80048a2] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:13,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:13,035 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:13,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-09 00:44:13,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-09 00:44:13,817 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:14,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-09 00:44:14,927 [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-08-09 00:44:15,435 [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-08-09 00:44:16,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-09 00:44:16,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:16,420 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-09 00:44:16,421 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:16,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-09 00:44:16,421 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:16,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:16,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:16,464 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:16,465 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:16,478 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:16,488 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:16,488 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-09 00:44:16,810 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-09 00:44:16,810 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-09 00:44:16,817 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:16,817 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:16,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:16,825 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-09 00:44:16,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:16,844 [ 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-08-09 00:44:16,864 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:16,873 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-09 00:44:16,873 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-09 00:44:17,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:17,016 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:17,086 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:17,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:17,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:17,168 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:17,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f41d6b50> has no local changes
2024-08-09 00:44:17,187 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:17,209 [ scc.git] DEBUG [detached HEAD 5df00a4] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:17,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:17,211 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:17,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-09 00:44:18,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-09 00:44:18,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-09 00:44:18,555 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:19,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-09 00:44:19,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-09 00:44:20,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-09 00:44:20,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-09 00:44:21,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:21,165 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-09 00:44:21,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-09 00:44:21,612 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:22,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-09 00:44:22,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-09 00:44:23,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-09 00:44:23,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-09 00:44:23,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:23,964 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-09 00:44:24,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-09 00:44:24,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-09 00:44:25,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-09 00:44:25,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-09 00:44:26,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-09 00:44:26,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-09 00:44:27,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:27,232 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-09 00:44:27,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-09 00:44:28,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-09 00:44:28,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-09 00:44:29,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-09 00:44:29,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-09 00:44:29,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-09 00:44:30,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:30,376 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-09 00:44:30,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-09 00:44:31,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-09 00:44:31,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-09 00:44:32,193 [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-08-09 00:44:32,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-09 00:44:33,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:33,113 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-09 00:44:33,114 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:33,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-09 00:44:33,114 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:33,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:33,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:33,135 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:33,136 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:33,180 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:33,193 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:33,194 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-09 00:44:33,724 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-09 00:44:33,724 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-09 00:44:33,733 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-09 00:44:34,686 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-09 00:44:34,687 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-09 00:44:34,695 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-09 00:44:35,147 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-09 00:44:35,147 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-09 00:44:35,166 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-09 00:44:35,471 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-09 00:44:35,471 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-09 00:44:35,492 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-09 00:44:35,841 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-09 00:44:35,842 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-09 00:44:35,856 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:35,856 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:35,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:35,867 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-09 00:44:35,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:35,885 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-09 00:44:35,994 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-09 00:44:35,995 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:36,001 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-09 00:44:36,001 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-09 00:44:36,001 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-09 00:44:36,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:36,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-09 00:44:36,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:36,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-09 00:44:36,334 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-09 00:44:36,335 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-09 00:44:36,335 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-09 00:44:36,335 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-09 00:44:36,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:36,345 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-09 00:44:36,346 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-09 00:44:36,346 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-09 00:44:36,346 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-09 00:44:36,346 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-09 00:44:36,346 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-09 00:44:36,346 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-09 00:44:36,346 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-09 00:44:36,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:36,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-09 00:44:36,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:36,559 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-09 00:44:36,653 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-09 00:44:36,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:36,659 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-09 00:44:36,659 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-09 00:44:36,659 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-09 00:44:36,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:36,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-09 00:44:36,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:37,012 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-09 00:44:37,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:37,109 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-09 00:44:37,109 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-09 00:44:37,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:37,322 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-09 00:44:37,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:37,376 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-09 00:44:37,478 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-09 00:44:37,478 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:37,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:37,713 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:37,808 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:37,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:37,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:37,874 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:37,888 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f419fd60> has no local changes
2024-08-09 00:44:37,889 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:37,913 [ scc.git] DEBUG [detached HEAD 4c5d23a] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:37,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:37,914 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:38,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-09 00:44:38,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-09 00:44:39,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-09 00:44:39,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-09 00:44:40,212 [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-08-09 00:44:40,751 [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-08-09 00:44:41,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-09 00:44:41,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:41,652 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-09 00:44:41,653 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:41,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-09 00:44:41,653 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:41,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:41,666 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:41,678 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:41,678 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:41,688 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:41,697 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:41,697 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-09 00:44:42,036 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-09 00:44:42,036 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-09 00:44:42,042 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:42,042 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:42,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:42,050 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-09 00:44:42,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:42,074 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-09 00:44:42,093 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:44:42,096 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-09 00:44:42,096 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-09 00:44:42,096 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-09 00:44:42,097 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-09 00:44:42,097 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-09 00:44:42,097 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-09 00:44:42,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:42,244 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:42,304 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:42,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:42,317 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:42,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:42,384 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f418ad30> has no local changes
2024-08-09 00:44:42,385 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:42,399 [ scc.git] DEBUG [detached HEAD 5a44e52] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:42,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:42,400 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:42,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-09 00:44:43,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-09 00:44:43,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-09 00:44:44,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-09 00:44:44,747 [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-08-09 00:44:45,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-09 00:44:45,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:45,683 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-09 00:44:46,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-09 00:44:46,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-09 00:44:47,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-09 00:44:47,564 [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-08-09 00:44:48,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-09 00:44:48,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:48,450 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-09 00:44:48,450 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:44:48,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-09 00:44:48,451 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:48,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:48,469 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:44:48,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:44:48,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:44:48,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:44:48,508 [ scc.git] DEBUG Already up to date.
2024-08-09 00:44:48,508 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-09 00:44:48,942 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-09 00:44:48,942 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-09 00:44:48,950 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-09 00:44:49,504 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-09 00:44:49,505 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-09 00:44:49,513 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:44:49,513 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:49,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:49,527 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-09 00:44:49,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:49,552 [ 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-08-09 00:44:49,616 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-09 00:44:49,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-09 00:44:49,617 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-09 00:44:49,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-09 00:44:49,618 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:44:49,619 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:44:49,627 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-09 00:44:49,652 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-09 00:44:49,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:49,791 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-09 00:44:49,803 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-09 00:44:49,811 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-09 00:44:49,822 [ scc.config] DEBUG Found github.token
2024-08-09 00:44:49,822 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-09 00:44:49,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-09 00:44:49,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:49,841 [ 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-08-09 00:44:49,874 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-09 00:44:49,874 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-09 00:44:49,874 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-09 00:44:49,874 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:44:49,875 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:44:49,883 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-09 00:44:49,894 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-09 00:44:50,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:44:50,208 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-09 00:44:50,223 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-09 00:44:50,234 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/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-08-09 00:44:50,242 [ scc.config] DEBUG Found github.token
2024-08-09 00:44:50,242 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-09 00:44:50,242 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:44:50,307 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:44:50,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:44:50,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:44:50,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:44:50,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f415df40> has no local changes
2024-08-09 00:44:50,408 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:44:50,421 [ scc.git] DEBUG [detached HEAD 92bae62] merge master -Dorg -Ssuccess-only
2024-08-09 00:44:50,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:44:50,422 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:44:50,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-09 00:44:51,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-09 00:44:51,232 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:51,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-09 00:44:52,295 [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-08-09 00:44:52,767 [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-08-09 00:44:53,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-09 00:44:53,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:53,697 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-09 00:44:54,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-09 00:44:54,187 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:54,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-09 00:44:55,209 [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-08-09 00:44:55,673 [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-08-09 00:44:56,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-09 00:44:56,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:56,619 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-09 00:44:57,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-09 00:44:57,056 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-09 00:44:57,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-09 00:44:58,047 [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-08-09 00:44:58,546 [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-08-09 00:44:59,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-09 00:44:59,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:44:59,524 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-09 00:44:59,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-09 00:45:00,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-09 00:45:00,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-09 00:45:01,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-09 00:45:01,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-09 00:45:02,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-09 00:45:02,454 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:02,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-09 00:45:02,455 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:02,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:02,467 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:02,483 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:02,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:02,499 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:02,511 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:02,511 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-09 00:45:02,864 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-09 00:45:02,864 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-09 00:45:02,877 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-09 00:45:03,223 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-09 00:45:03,224 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-09 00:45:03,229 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-09 00:45:03,520 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-09 00:45:03,520 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-09 00:45:03,526 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:03,526 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:03,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:03,534 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-09 00:45:03,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:03,555 [ 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-08-09 00:45:03,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:03,580 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-09 00:45:03,580 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-09 00:45:03,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:03,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-09 00:45:03,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:03,777 [ 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-08-09 00:45:03,841 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-09 00:45:03,842 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:03,846 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-09 00:45:03,846 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-09 00:45:04,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:04,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-09 00:45:04,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:04,162 [ 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-08-09 00:45:04,213 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-09 00:45:04,214 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:04,218 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-09 00:45:04,218 [ scc.git] DEBUG package.json | 2 +-
2024-08-09 00:45:04,218 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-09 00:45:04,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:04,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:04,574 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:04,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:04,584 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:04,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:04,639 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f4118580> has no local changes
2024-08-09 00:45:04,639 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:04,649 [ scc.git] DEBUG [detached HEAD ac38929] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:04,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:04,650 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:05,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-09 00:45:05,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-09 00:45:05,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-09 00:45:06,409 [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-08-09 00:45:06,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-09 00:45:07,349 [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-08-09 00:45:07,349 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-09 00:45:07,350 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:07,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-09 00:45:07,350 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:07,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:07,358 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:07,365 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:07,365 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:07,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:07,381 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:07,381 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-09 00:45:07,737 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-09 00:45:07,739 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-09 00:45:07,761 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:07,763 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:07,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:07,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-09 00:45:07,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:07,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-09 00:45:07,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:07,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:07,953 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:08,006 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:08,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:08,015 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:08,056 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:08,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f412ae80> has no local changes
2024-08-09 00:45:08,063 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:08,072 [ scc.git] DEBUG [detached HEAD 320c32f] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:08,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:08,073 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:08,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-09 00:45:08,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-09 00:45:09,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-09 00:45:09,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-09 00:45:10,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-09 00:45:10,817 [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-08-09 00:45:11,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-09 00:45:11,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:45:11,737 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-09 00:45:11,737 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:11,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-09 00:45:11,738 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:11,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:11,746 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:11,754 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:11,754 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:11,761 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:11,768 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:11,768 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-09 00:45:12,296 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-09 00:45:12,296 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-09 00:45:12,302 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:12,302 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:12,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:12,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-09 00:45:12,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:12,328 [ 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-08-09 00:45:12,341 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-09 00:45:12,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:12,345 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-09 00:45:12,345 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-09 00:45:12,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:12,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:12,568 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:12,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:12,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:12,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:12,625 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40aeb50> has no local changes
2024-08-09 00:45:12,625 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:12,636 [ scc.git] DEBUG [detached HEAD 42856f6] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:12,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:12,637 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:13,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-09 00:45:13,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-09 00:45:14,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-09 00:45:14,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-09 00:45:15,070 [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-08-09 00:45:15,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-09 00:45:16,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:45:16,007 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-09 00:45:16,007 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:16,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-09 00:45:16,007 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:16,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:16,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:16,020 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:16,021 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:16,027 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:16,033 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:16,033 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-09 00:45:16,421 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-09 00:45:16,421 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-09 00:45:16,426 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:16,427 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:16,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:16,434 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-09 00:45:16,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:16,450 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-09 00:45:16,497 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG Auto-merging setup.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-09 00:45:16,498 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:45:16,498 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:45:16,505 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-09 00:45:16,513 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-09 00:45:16,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:16,648 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-09 00:45:16,656 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-09 00:45:16,666 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-08-09 00:45:16,675 [ scc.config] DEBUG Found github.token
2024-08-09 00:45:16,676 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-09 00:45:16,676 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:16,727 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:16,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:16,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:16,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:16,787 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f4118730> has no local changes
2024-08-09 00:45:16,787 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:16,797 [ scc.git] DEBUG [detached HEAD 8a0597b] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:16,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:16,798 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:17,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-09 00:45:17,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-09 00:45:18,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-09 00:45:18,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-09 00:45:18,999 [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-08-09 00:45:19,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-09 00:45:19,925 [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-08-09 00:45:19,926 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-09 00:45:19,926 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:19,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-09 00:45:19,927 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:19,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:19,934 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:19,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:19,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:19,945 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:19,951 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:19,951 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-09 00:45:20,329 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-09 00:45:20,330 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-09 00:45:20,335 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:20,335 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:20,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:20,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-09 00:45:20,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:20,360 [ 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-08-09 00:45:20,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-09 00:45:20,389 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-09 00:45:20,391 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-09 00:45:20,392 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-09 00:45:20,392 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-09 00:45:20,392 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-09 00:45:20,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:20,520 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:20,564 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:20,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:20,571 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:20,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:20,623 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40e6640> has no local changes
2024-08-09 00:45:20,623 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:20,633 [ scc.git] DEBUG [detached HEAD b91462f] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:20,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:20,633 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:20,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-09 00:45:20,952 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:20,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-09 00:45:20,953 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:20,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:20,969 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:20,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:20,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:21,014 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:21,029 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:21,030 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:21,030 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:21,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:21,044 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:21,087 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:21,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:21,093 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:21,140 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:21,149 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f4081e80> has no local changes
2024-08-09 00:45:21,149 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:21,158 [ scc.git] DEBUG [detached HEAD c89464e] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:21,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:21,159 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:21,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-09 00:45:21,378 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:21,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-09 00:45:21,378 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:21,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:21,384 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:21,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:21,391 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:21,396 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:21,403 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:21,403 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:21,403 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:21,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:21,409 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:21,461 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:21,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:21,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:21,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:21,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40acca0> has no local changes
2024-08-09 00:45:21,521 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:21,530 [ scc.git] DEBUG [detached HEAD b5a06a2] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:21,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:21,530 [ scc.git] INFO Overriding base-branch from master to main
2024-08-09 00:45:21,531 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:21,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-09 00:45:22,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-09 00:45:22,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-09 00:45:23,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-09 00:45:23,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-09 00:45:24,387 [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-08-09 00:45:24,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-09 00:45:25,309 [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-08-09 00:45:25,310 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-09 00:45:25,310 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:25,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-09 00:45:25,310 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:25,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:25,320 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-09 00:45:25,328 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:25,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-09 00:45:25,335 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-09 00:45:25,343 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:25,343 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-09 00:45:25,699 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-09 00:45:25,700 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-09 00:45:25,721 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:25,722 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:25,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:25,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-09 00:45:25,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:25,779 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-09 00:45:25,806 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-09 00:45:25,807 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-09 00:45:25,807 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:45:25,807 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:45:25,816 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-09 00:45:25,826 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-09 00:45:25,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:25,963 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-09 00:45:25,972 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-09 00:45:25,979 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-09 00:45:25,984 [ scc.config] DEBUG Found github.token
2024-08-09 00:45:25,985 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-09 00:45:25,985 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:26,051 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:26,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:26,124 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40b1f40> has no local changes
2024-08-09 00:45:26,124 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:26,134 [ scc.git] DEBUG [detached HEAD 9e44280] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:26,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:26,135 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:26,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-09 00:45:26,376 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:26,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-09 00:45:26,376 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,383 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:26,389 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:26,389 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:26,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:26,404 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:26,404 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:26,404 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,410 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:26,451 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,456 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:26,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:26,504 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40707c0> has no local changes
2024-08-09 00:45:26,504 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:26,514 [ scc.git] DEBUG [detached HEAD f31a8b2] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:26,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:26,515 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:26,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-09 00:45:26,790 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:26,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-09 00:45:26,790 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,797 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:26,803 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:26,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:26,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:26,816 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:26,816 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:26,816 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,822 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:26,865 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:26,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:26,871 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:26,913 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:26,920 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f40a8490> has no local changes
2024-08-09 00:45:26,920 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:26,929 [ scc.git] DEBUG [detached HEAD 9b9ed97] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:26,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:26,929 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:27,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-09 00:45:27,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-09 00:45:28,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-09 00:45:28,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-09 00:45:29,165 [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-08-09 00:45:29,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-09 00:45:30,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:45:30,067 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-09 00:45:30,067 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:30,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-09 00:45:30,067 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:30,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:30,075 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-09 00:45:30,081 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:30,081 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-09 00:45:30,087 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-09 00:45:30,092 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:30,093 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-09 00:45:30,493 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-09 00:45:30,493 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-09 00:45:30,501 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:30,501 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:30,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:30,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-09 00:45:30,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:30,522 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-09 00:45:30,610 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-09 00:45:30,610 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-09 00:45:30,610 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:45:30,611 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:45:30,619 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-09 00:45:30,627 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-09 00:45:30,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:30,818 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-09 00:45:30,826 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-09 00:45:30,832 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-09 00:45:30,839 [ scc.config] DEBUG Found github.token
2024-08-09 00:45:30,839 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-09 00:45:30,840 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:30,914 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:30,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:30,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:30,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:30,978 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f404b8b0> has no local changes
2024-08-09 00:45:30,978 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:30,989 [ scc.git] DEBUG [detached HEAD ebbf46f] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:30,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:30,990 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-09 00:45:30,990 [ scc.repo] DEBUG ## PRs found:
2024-08-09 00:45:31,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-09 00:45:32,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-09 00:45:32,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-09 00:45:33,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-09 00:45:33,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-09 00:45:33,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-09 00:45:34,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-09 00:45:34,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-09 00:45:35,258 [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-08-09 00:45:35,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-09 00:45:36,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-09 00:45:36,091 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-09 00:45:36,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-09 00:45:37,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-09 00:45:37,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-09 00:45:37,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-09 00:45:37,912 [ scc.repo] DEBUG ## Branches found:
2024-08-09 00:45:37,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-09 00:45:37,912 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:37,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:37,918 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-09 00:45:37,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-09 00:45:37,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-09 00:45:37,932 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-09 00:45:37,941 [ scc.git] DEBUG Already up to date.
2024-08-09 00:45:37,941 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-09 00:45:38,356 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-09 00:45:38,356 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-09 00:45:38,361 [ scc.git] DEBUG ## Unique users: []
2024-08-09 00:45:38,361 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:38,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:38,367 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-09 00:45:38,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:38,380 [ 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-08-09 00:45:38,416 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-09 00:45:38,416 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-09 00:45:38,416 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-09 00:45:38,417 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-09 00:45:38,424 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-09 00:45:38,433 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-09 00:45:38,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:38,564 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-09 00:45:38,571 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-09 00:45:38,576 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#147](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-09 00:45:38,581 [ scc.config] DEBUG Found github.token
2024-08-09 00:45:38,581 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-09 00:45:38,581 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-09 00:45:38,624 [ scc.git] DEBUG Get sha1 of %s
2024-08-09 00:45:38,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-09 00:45:38,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:38,673 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:38,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f404b5b0> has no local changes
2024-08-09 00:45:38,681 [ 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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:38,690 [ scc.git] DEBUG [detached HEAD 26543b0] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:38,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:38,691 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-09 00:45:38,773 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-09 00:45:38,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:38,963 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-09 00:45:38,968 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-09 00:45:39,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:39,366 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-09 00:45:39,372 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-09 00:45:39,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:39,750 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-09 00:45:39,756 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-09 00:45:40,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:40,141 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-09 00:45:40,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:40,529 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-09 00:45:40,534 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-09 00:45:40,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:40,918 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-09 00:45:40,923 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-09 00:45:41,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:41,300 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-09 00:45:41,305 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-09 00:45:41,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:41,681 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-09 00:45:41,686 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-09 00:45:42,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:42,086 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-09 00:45:42,091 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-09 00:45:42,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:42,483 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-09 00:45:42,491 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-09 00:45:42,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:42,878 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-09 00:45:42,885 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-09 00:45:43,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:43,269 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-09 00:45:43,276 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-09 00:45:43,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:43,664 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-09 00:45:44,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:44,035 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-09 00:45:44,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:44,417 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-09 00:45:44,423 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-09 00:45:44,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:44,821 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-09 00:45:45,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:45,195 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-09 00:45:45,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:45,566 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-09 00:45:45,581 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-09 00:45:45,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:45,964 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-09 00:45:45,972 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-09 00:45:46,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:46,347 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-09 00:45:46,354 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-09 00:45:46,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:46,747 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-09 00:45:46,757 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-09 00:45:47,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-09 00:45:47,155 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-09 00:45:47,157 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-09 00:45:47,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f81f4ad5d30> has local changes
2024-08-09 00:45:47,324 [ 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.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
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#147 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/147/)'
2024-08-09 00:45:47,348 [ scc.git] DEBUG [detached HEAD ff622a1] merge master -Dorg -Ssuccess-only
2024-08-09 00:45:47,349 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-09 00:45:47,349 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-09 00:45:47,349 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,349 [ scc.merge] INFO
2024-08-09 00:45:47,349 [ scc.merge] INFO
2024-08-09 00:45:47,349 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-09 00:45:47,349 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,349 [ scc.merge] INFO
2024-08-09 00:45:47,349 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,349 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-09 00:45:47,349 [ scc.merge] INFO
2024-08-09 00:45:47,349 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-09 00:45:47,349 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,349 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-09 00:45:47,349 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,349 [ scc.merge] INFO
2024-08-09 00:45:47,349 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,349 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-09 00:45:47,350 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-09 00:45:47,350 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-09 00:45:47,350 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-09 00:45:47,350 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,350 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-09 00:45:47,350 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-09 00:45:47,350 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-09 00:45:47,350 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,350 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-09 00:45:47,351 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-09 00:45:47,351 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-09 00:45:47,351 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-09 00:45:47,351 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-09 00:45:47,351 [ scc.merge] INFO
2024-08-09 00:45:47,351 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-09 00:45:47,351 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,351 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-09 00:45:47,352 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-09 00:45:47,352 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-09 00:45:47,352 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-09 00:45:47,352 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-09 00:45:47,352 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-09 00:45:47,352 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-09 00:45:47,352 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,352 [ scc.merge] INFO
2024-08-09 00:45:47,352 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,352 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,353 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Merged PRs:
2024-08-09 00:45:47,353 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-09 00:45:47,353 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,353 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,353 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-09 00:45:47,353 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,353 [ scc.merge] INFO
2024-08-09 00:45:47,354 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-09 00:45:47,354 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,354 [ scc.merge] INFO
2024-08-09 00:45:47,354 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-09 00:45:47,354 [ scc.merge] INFO
2024-08-09 00:45:47,354 [ scc.merge] INFO Repository: ome/scripts
2024-08-09 00:45:47,354 [ scc.merge] INFO Excluded PRs:
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-09 00:45:47,354 [ scc.merge] INFO Already up to date.
2024-08-09 00:45:47,354 [ scc.merge] INFO
2024-08-09 00:45:47,354 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-09 00:45:47,354 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-09 00:45:47,354 [ scc.merge] INFO
2024-08-09 00:45:47,354 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-09 00:45:47,354 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-09 00:45:47,368 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-09 00:45:47,382 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-09 00:45:47,390 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-09 00:45:47,397 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-09 00:45:47,404 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-09 00:45:47,411 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-09 00:45:47,420 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-09 00:45:47,431 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-09 00:45:47,440 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-09 00:45:47,453 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-09 00:45:47,463 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-09 00:45:47,474 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-09 00:45:47,482 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-09 00:45:47,489 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-09 00:45:47,498 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-09 00:45:47,507 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-09 00:45:47,517 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-09 00:45:47,526 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-09 00:45:47,533 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-09 00:45:47,541 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-09 00:45:47,550 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-09 00:45:47,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-09 00:45:47,563 [ scc.git] DEBUG Calling 'git remote'
2024-08-09 00:45:47,571 [ 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.9.2 to 5.9.3-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 1346098] 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 9b73dd9
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 fefe87cf
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 a8f380f
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 cda3ec6
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 312afbe
nothing to commit, working tree clean
[detached HEAD 1584d95] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-09 00:46:35,247 [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-08-09 00:46:44,034 [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-08-09 00:46:46,346 [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-08-09 00:46:50,806 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-09 00:47:33,771 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
