Console Output
Skipping 94 KB..
Full Log2024-08-06 00:42:58,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-06 00:42:58,824 [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-06 00:42:59,245 [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-06 00:42:59,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-06 00:43:00,074 [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-06 00:43:00,075 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-06 00:43:00,076 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:00,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-06 00:43:00,076 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:00,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:00,084 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:00,090 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:00,091 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:00,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:00,108 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:00,108 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-06 00:43:00,466 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-06 00:43:00,466 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-06 00:43:00,472 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-06 00:43:01,097 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-06 00:43:01,097 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-06 00:43:01,106 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-06 00:43:02,124 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-06 00:43:02,124 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-06 00:43:02,131 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-06 00:43:02,493 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-06 00:43:02,493 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-06 00:43:02,498 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-06 00:43:02,923 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-06 00:43:02,923 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-06 00:43:02,928 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:02,928 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:02,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:02,935 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-06 00:43:02,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:02,950 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-06 00:43:02,968 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-06 00:43:02,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:02,976 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-06 00:43:02,977 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-06 00:43:02,977 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-06 00:43:03,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:03,108 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-06 00:43:03,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:03,122 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-06 00:43:03,364 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-06 00:43:03,365 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-06 00:43:03,365 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-06 00:43:03,365 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-06 00:43:03,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:03,371 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-06 00:43:03,371 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-06 00:43:03,371 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-06 00:43:03,371 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-06 00:43:03,371 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-06 00:43:03,373 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-06 00:43:03,374 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-06 00:43:03,374 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-06 00:43:03,374 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-06 00:43:03,374 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-06 00:43:03,374 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-06 00:43:03,374 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-06 00:43:03,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:03,502 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-06 00:43:03,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:03,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-06 00:43:03,675 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-06 00:43:03,676 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:03,683 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-06 00:43:03,683 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-06 00:43:03,683 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-06 00:43:03,683 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-06 00:43:03,683 [ scc.git] DEBUG src/index.html | 1 +
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-06 00:43:03,684 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-06 00:43:03,684 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-06 00:43:03,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:03,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-06 00:43:03,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:03,907 [ 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-06 00:43:03,948 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:03,951 [ scc.git] DEBUG setup.py | 2 +-
2024-08-06 00:43:03,952 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-06 00:43:04,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:04,282 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-06 00:43:04,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:04,299 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-06 00:43:04,356 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-06 00:43:04,356 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-06 00:43:04,357 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:04,363 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-06 00:43:04,363 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-06 00:43:04,363 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-06 00:43:04,363 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-06 00:43:04,363 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-06 00:43:04,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:04,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:04,724 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:04,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:04,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:04,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:04,774 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e35787490> has no local changes
2024-08-06 00:43:04,775 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:04,786 [ scc.git] DEBUG [detached HEAD f94a5ddd] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:04,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:04,786 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:05,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-06 00:43:05,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-06 00:43:06,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-06 00:43:06,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-06 00:43:07,108 [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-06 00:43:07,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-06 00:43:07,989 [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-06 00:43:07,990 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-06 00:43:07,990 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:07,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-06 00:43:07,991 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:07,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:08,000 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:08,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:08,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:08,019 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:08,027 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:08,028 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-06 00:43:08,339 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-06 00:43:08,340 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-06 00:43:08,344 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:08,345 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:08,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:08,351 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-06 00:43:08,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:08,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-06 00:43:08,400 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-06 00:43:08,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:08,404 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-06 00:43:08,405 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-06 00:43:08,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:08,547 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:08,594 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:08,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:08,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:08,646 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:08,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e357b27c0> has no local changes
2024-08-06 00:43:08,654 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:08,664 [ scc.git] DEBUG [detached HEAD 049a61d] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:08,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:08,665 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:09,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-06 00:43:09,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-06 00:43:09,462 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:10,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-06 00:43:10,509 [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-06 00:43:11,069 [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-06 00:43:11,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-06 00:43:12,051 [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-06 00:43:12,052 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-06 00:43:12,052 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:12,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-06 00:43:12,052 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:12,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:12,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:12,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:12,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:12,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:12,076 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:12,076 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-06 00:43:12,402 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-06 00:43:12,403 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-06 00:43:12,408 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:12,408 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:12,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:12,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-06 00:43:12,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:12,424 [ 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-06 00:43:12,435 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:12,439 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-06 00:43:12,439 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-06 00:43:12,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:12,576 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:12,619 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:12,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:12,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:12,668 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:12,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e357a9af0> has no local changes
2024-08-06 00:43:12,703 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:12,718 [ scc.git] DEBUG [detached HEAD 3331b93] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:12,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:12,719 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:13,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-06 00:43:13,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-06 00:43:14,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-06 00:43:14,024 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:14,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-06 00:43:15,149 [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-06 00:43:15,657 [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-06 00:43:16,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-06 00:43:16,650 [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-06 00:43:16,651 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-06 00:43:17,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-06 00:43:17,107 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:17,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-06 00:43:18,122 [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-06 00:43:18,755 [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-06 00:43:19,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-06 00:43:19,580 [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-06 00:43:19,580 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-06 00:43:20,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-06 00:43:20,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-06 00:43:21,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-06 00:43:21,615 [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-06 00:43:22,078 [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-06 00:43:22,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-06 00:43:22,933 [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-06 00:43:22,934 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-06 00:43:23,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-06 00:43:23,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-06 00:43:24,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-06 00:43:24,931 [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-06 00:43:25,488 [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-06 00:43:25,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-06 00:43:26,359 [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-06 00:43:26,360 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-06 00:43:26,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-06 00:43:27,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-06 00:43:27,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-06 00:43:28,159 [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-06 00:43:28,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-06 00:43:28,995 [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-06 00:43:28,995 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-06 00:43:28,996 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:28,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-06 00:43:28,996 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:28,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:29,002 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:29,006 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:29,006 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:29,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:29,073 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:29,073 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-06 00:43:29,421 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-06 00:43:29,422 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-06 00:43:29,427 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-06 00:43:30,412 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-06 00:43:30,413 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-06 00:43:30,418 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-06 00:43:30,802 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-06 00:43:30,802 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-06 00:43:30,808 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-06 00:43:31,139 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-06 00:43:31,139 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-06 00:43:31,145 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-06 00:43:31,424 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-06 00:43:31,424 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-06 00:43:31,429 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:31,429 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:31,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:31,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-06 00:43:31,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:31,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-06 00:43:31,521 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-06 00:43:31,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:31,526 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-06 00:43:31,526 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-06 00:43:31,526 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-06 00:43:31,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:31,660 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-06 00:43:31,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:31,673 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-06 00:43:31,822 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-06 00:43:31,822 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-06 00:43:31,822 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-06 00:43:31,822 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-06 00:43:31,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:31,837 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-06 00:43:31,837 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-06 00:43:31,837 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-06 00:43:31,837 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-06 00:43:31,837 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-06 00:43:31,837 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-06 00:43:31,837 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-06 00:43:31,837 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-06 00:43:32,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:32,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-06 00:43:32,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:32,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-06 00:43:32,111 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-06 00:43:32,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:32,115 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-06 00:43:32,115 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-06 00:43:32,115 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-06 00:43:32,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:32,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-06 00:43:32,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:32,485 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-06 00:43:32,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:32,525 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-06 00:43:32,525 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-06 00:43:32,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:32,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-06 00:43:32,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:32,870 [ 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-06 00:43:32,925 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-06 00:43:32,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:33,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:33,247 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:33,294 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:33,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:33,302 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:33,348 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:33,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e357a9d90> has no local changes
2024-08-06 00:43:33,360 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:33,370 [ scc.git] DEBUG [detached HEAD 2381a38] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:33,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:33,370 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:33,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-06 00:43:34,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-06 00:43:34,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-06 00:43:35,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-06 00:43:35,764 [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-06 00:43:36,193 [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-06 00:43:36,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-06 00:43:37,095 [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-06 00:43:37,096 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-06 00:43:37,096 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:37,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-06 00:43:37,097 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:37,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:37,104 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:37,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:37,111 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:37,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:37,126 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:37,126 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-06 00:43:37,432 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-06 00:43:37,432 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-06 00:43:37,437 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:37,437 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:37,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:37,443 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-06 00:43:37,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:37,455 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-06 00:43:37,465 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:37,468 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-06 00:43:37,468 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-06 00:43:37,468 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-06 00:43:37,468 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-06 00:43:37,468 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-06 00:43:37,468 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-06 00:43:37,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:37,615 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:37,655 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:37,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:37,661 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:37,700 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:37,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e34732f70> has no local changes
2024-08-06 00:43:37,707 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:37,717 [ scc.git] DEBUG [detached HEAD a1053a9] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:37,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:37,718 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:38,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-06 00:43:38,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-06 00:43:39,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-06 00:43:39,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-06 00:43:40,040 [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-06 00:43:40,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-06 00:43:41,012 [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-06 00:43:41,012 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-06 00:43:41,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-06 00:43:41,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-06 00:43:42,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-06 00:43:42,872 [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-06 00:43:43,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-06 00:43:43,685 [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-06 00:43:43,686 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-06 00:43:43,686 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:43,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-06 00:43:43,687 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:43,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:43,694 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:43,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:43,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:43,705 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:43,711 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:43,711 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-06 00:43:44,249 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-06 00:43:44,249 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-06 00:43:44,254 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-06 00:43:44,702 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-06 00:43:44,702 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-06 00:43:44,707 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:44,707 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:44,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:44,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-06 00:43:44,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:44,727 [ 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-06 00:43:44,765 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-06 00:43:44,765 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-06 00:43:44,765 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-06 00:43:44,765 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-06 00:43:44,765 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:43:44,765 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:43:44,771 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-06 00:43:44,778 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-06 00:43:44,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:44,926 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-06 00:43:44,934 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-06 00:43:44,941 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-06 00:43:44,949 [ scc.config] DEBUG Found github.token
2024-08-06 00:43:44,949 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-06 00:43:44,949 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-06 00:43:44,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:44,966 [ 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-06 00:43:44,991 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-06 00:43:44,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-06 00:43:44,991 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-06 00:43:44,991 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:43:44,992 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:43:44,999 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-06 00:43:45,007 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-06 00:43:45,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:45,310 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-06 00:43:45,319 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-06 00:43:45,326 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/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-06 00:43:45,334 [ scc.config] DEBUG Found github.token
2024-08-06 00:43:45,334 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-06 00:43:45,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:45,380 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:45,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:45,387 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:45,431 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:45,440 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e3575ec10> has no local changes
2024-08-06 00:43:45,440 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:45,452 [ scc.git] DEBUG [detached HEAD 86e35bf] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:45,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:45,452 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:45,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-06 00:43:46,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-06 00:43:46,295 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:46,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-06 00:43:47,312 [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-06 00:43:47,755 [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-06 00:43:48,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-06 00:43:48,702 [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-06 00:43:48,703 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-06 00:43:49,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-06 00:43:49,177 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:49,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-06 00:43:50,236 [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-06 00:43:50,702 [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-06 00:43:51,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-06 00:43:51,536 [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-06 00:43:51,536 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-06 00:43:52,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-06 00:43:52,005 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-06 00:43:52,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-06 00:43:53,131 [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-06 00:43:53,578 [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-06 00:43:54,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-06 00:43:54,548 [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-06 00:43:54,549 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-06 00:43:55,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-06 00:43:55,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-06 00:43:55,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-06 00:43:56,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-06 00:43:56,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-06 00:43:57,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-06 00:43:57,332 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:43:57,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-06 00:43:57,333 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:57,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:57,338 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:43:57,344 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:43:57,344 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:43:57,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:43:57,357 [ scc.git] DEBUG Already up to date.
2024-08-06 00:43:57,357 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-06 00:43:57,709 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-06 00:43:57,709 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-06 00:43:57,715 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-06 00:43:58,012 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-06 00:43:58,013 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-06 00:43:58,022 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-06 00:43:58,325 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-06 00:43:58,325 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-06 00:43:58,334 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:43:58,335 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:58,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:58,351 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-06 00:43:58,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:58,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-06 00:43:58,390 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:58,395 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-06 00:43:58,395 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-06 00:43:58,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:58,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-06 00:43:58,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:58,546 [ 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-06 00:43:58,607 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-06 00:43:58,609 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:58,618 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-06 00:43:58,618 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-06 00:43:58,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:58,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-06 00:43:58,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:58,965 [ 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-06 00:43:58,993 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-06 00:43:58,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:43:59,001 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-06 00:43:59,002 [ scc.git] DEBUG package.json | 2 +-
2024-08-06 00:43:59,002 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-06 00:43:59,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:43:59,326 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:43:59,409 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:43:59,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:43:59,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:43:59,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:43:59,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346fa5b0> has no local changes
2024-08-06 00:43:59,514 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:43:59,530 [ scc.git] DEBUG [detached HEAD b9cd997] merge master -Dorg -Ssuccess-only
2024-08-06 00:43:59,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:43:59,531 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:43:59,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-06 00:44:00,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-06 00:44:00,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-06 00:44:01,388 [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-06 00:44:01,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-06 00:44:02,249 [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-06 00:44:02,250 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-06 00:44:02,250 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:02,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-06 00:44:02,251 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:02,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:02,261 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:02,270 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:02,270 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:02,280 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:02,293 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:02,293 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-06 00:44:02,696 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-06 00:44:02,697 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-06 00:44:02,704 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:02,704 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:02,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:02,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-06 00:44:02,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:02,744 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-06 00:44:02,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:44:02,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:02,910 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:02,963 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:02,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:02,978 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:03,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:03,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e34747eb0> has no local changes
2024-08-06 00:44:03,051 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:03,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:03,069 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:03,070 [ scc.git] DEBUG [detached HEAD 64140c3] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:03,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-06 00:44:03,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-06 00:44:04,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-06 00:44:04,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-06 00:44:05,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-06 00:44:05,855 [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-06 00:44:06,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-06 00:44:06,738 [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-06 00:44:06,741 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-06 00:44:06,742 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:06,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-06 00:44:06,743 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:06,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:06,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:06,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:06,787 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:06,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:06,806 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:06,806 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-06 00:44:07,187 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-06 00:44:07,187 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-06 00:44:07,193 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:07,193 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:07,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:07,200 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-06 00:44:07,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:07,213 [ 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-06 00:44:07,224 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-06 00:44:07,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:44:07,228 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-06 00:44:07,228 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-06 00:44:07,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:07,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:07,413 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:07,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:07,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:07,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:07,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e3468bbb0> has no local changes
2024-08-06 00:44:07,487 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:07,500 [ scc.git] DEBUG [detached HEAD 5ca377b] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:07,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:07,501 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:07,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-06 00:44:08,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-06 00:44:08,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-06 00:44:09,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-06 00:44:09,838 [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-06 00:44:10,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-06 00:44:10,672 [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-06 00:44:10,673 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-06 00:44:10,673 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:10,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-06 00:44:10,674 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:10,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:10,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:10,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:10,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:10,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:10,702 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:10,703 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-06 00:44:11,064 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-06 00:44:11,064 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-06 00:44:11,069 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:11,069 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:11,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:11,076 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-06 00:44:11,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:11,091 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-06 00:44:11,133 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-06 00:44:11,133 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-06 00:44:11,133 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-06 00:44:11,133 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-06 00:44:11,134 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-06 00:44:11,134 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-06 00:44:11,134 [ scc.git] DEBUG Auto-merging setup.py
2024-08-06 00:44:11,134 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-06 00:44:11,134 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:44:11,134 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:44:11,144 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-06 00:44:11,155 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-06 00:44:11,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:11,293 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-06 00:44:11,300 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-06 00:44:11,309 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-08-06 00:44:11,316 [ scc.config] DEBUG Found github.token
2024-08-06 00:44:11,316 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-06 00:44:11,316 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:11,358 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:11,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:11,365 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:11,413 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:11,421 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346fa7f0> has no local changes
2024-08-06 00:44:11,421 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:11,430 [ scc.git] DEBUG [detached HEAD 295374d] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:11,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:11,431 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:11,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-06 00:44:12,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-06 00:44:12,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-06 00:44:13,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-06 00:44:13,721 [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-06 00:44:14,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-06 00:44:14,534 [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-06 00:44:14,535 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-06 00:44:14,535 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:14,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-06 00:44:14,535 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:14,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:14,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:14,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:14,549 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:14,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:14,561 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:14,562 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-06 00:44:14,967 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-06 00:44:14,967 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-06 00:44:14,973 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:14,973 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:14,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:14,982 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-06 00:44:14,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:15,001 [ 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-06 00:44:15,045 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-06 00:44:15,049 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-06 00:44:15,049 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-06 00:44:15,049 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-06 00:44:15,052 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-06 00:44:15,052 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-06 00:44:15,052 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-06 00:44:15,053 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-06 00:44:15,053 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-06 00:44:15,053 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-06 00:44:15,053 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-06 00:44:15,053 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-06 00:44:15,054 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-06 00:44:15,055 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-06 00:44:15,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:15,189 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:15,235 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:15,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:15,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:15,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:15,299 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e34703ca0> has no local changes
2024-08-06 00:44:15,299 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:15,350 [ scc.git] DEBUG [detached HEAD 85d71d1] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:15,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:15,351 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:15,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-06 00:44:15,608 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:15,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-06 00:44:15,609 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:15,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:15,616 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:15,624 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:15,624 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:15,632 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:15,639 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:15,639 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:15,639 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:15,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:15,645 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:15,689 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:15,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:15,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:15,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:15,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346652b0> has no local changes
2024-08-06 00:44:15,747 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:15,758 [ scc.git] DEBUG [detached HEAD 4b17ca3] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:15,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:15,758 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:16,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-06 00:44:16,018 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:16,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-06 00:44:16,018 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:16,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:16,027 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:16,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:16,036 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:16,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:16,058 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:16,058 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:16,058 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:16,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:16,070 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:16,133 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:16,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:16,145 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:16,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:16,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346c8d60> has no local changes
2024-08-06 00:44:16,212 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:16,225 [ scc.git] DEBUG [detached HEAD b5fdf0b] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:16,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:16,226 [ scc.git] INFO Overriding base-branch from master to main
2024-08-06 00:44:16,226 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:16,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-06 00:44:16,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-06 00:44:17,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-06 00:44:17,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-06 00:44:18,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-06 00:44:18,883 [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-06 00:44:19,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-06 00:44:19,826 [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-06 00:44:19,828 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-06 00:44:19,828 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:19,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-06 00:44:19,828 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:19,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:19,839 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-06 00:44:19,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:19,849 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-06 00:44:19,871 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-06 00:44:19,881 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:19,882 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-06 00:44:20,288 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-06 00:44:20,288 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-06 00:44:20,294 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:20,294 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:20,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:20,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-06 00:44:20,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:20,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-06 00:44:20,348 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-06 00:44:20,349 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-06 00:44:20,349 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:44:20,351 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:44:20,362 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-06 00:44:20,371 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-06 00:44:20,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:20,509 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-06 00:44:20,518 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-06 00:44:20,526 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-06 00:44:20,535 [ scc.config] DEBUG Found github.token
2024-08-06 00:44:20,535 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-06 00:44:20,535 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:20,587 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:20,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:20,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:20,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:20,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346b69a0> has no local changes
2024-08-06 00:44:20,648 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:20,658 [ scc.git] DEBUG [detached HEAD d6b0785] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:20,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:20,659 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:20,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-06 00:44:20,920 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:20,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-06 00:44:20,920 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:20,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:20,926 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:20,933 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:20,933 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:20,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:20,948 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:20,948 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:20,948 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:20,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:20,955 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:21,003 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:21,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:21,013 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:21,059 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:21,067 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346637c0> has no local changes
2024-08-06 00:44:21,067 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:21,078 [ scc.git] DEBUG [detached HEAD ec8bcd9] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:21,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:21,079 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:21,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-06 00:44:21,334 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:21,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-06 00:44:21,334 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:21,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:21,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:21,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:21,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:21,352 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:21,358 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:21,359 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:21,359 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:21,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:21,365 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:21,408 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:21,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:21,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:21,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:21,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e346874f0> has no local changes
2024-08-06 00:44:21,466 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:21,476 [ scc.git] DEBUG [detached HEAD 6452fbd] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:21,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:21,477 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:21,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-06 00:44:22,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-06 00:44:22,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-06 00:44:23,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-06 00:44:23,649 [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-06 00:44:24,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-06 00:44:24,468 [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-06 00:44:24,469 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-06 00:44:24,470 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:24,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-06 00:44:24,470 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:24,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:24,488 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-06 00:44:24,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:24,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-06 00:44:24,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-06 00:44:24,520 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:24,521 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-06 00:44:24,904 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-06 00:44:24,904 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-06 00:44:24,910 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:24,910 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:24,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:24,917 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-06 00:44:24,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:24,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-06 00:44:25,012 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-06 00:44:25,012 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-06 00:44:25,012 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:44:25,013 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:44:25,025 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-06 00:44:25,037 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-06 00:44:25,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:25,174 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-06 00:44:25,185 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-06 00:44:25,194 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-06 00:44:25,208 [ scc.config] DEBUG Found github.token
2024-08-06 00:44:25,208 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-06 00:44:25,208 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:25,254 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:25,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:25,264 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:25,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:25,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e3467cdf0> has no local changes
2024-08-06 00:44:25,317 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:25,328 [ scc.git] DEBUG [detached HEAD aee7814] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:25,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:25,329 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-06 00:44:25,329 [ scc.repo] DEBUG ## PRs found:
2024-08-06 00:44:25,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-06 00:44:26,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-06 00:44:26,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-06 00:44:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-06 00:44:27,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-06 00:44:28,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-06 00:44:28,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-06 00:44:28,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-06 00:44:29,308 [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-06 00:44:29,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-06 00:44:30,170 [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-06 00:44:30,171 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-06 00:44:30,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-06 00:44:31,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-06 00:44:31,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-06 00:44:32,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-06 00:44:32,024 [ scc.repo] DEBUG ## Branches found:
2024-08-06 00:44:32,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-06 00:44:32,024 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:32,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:32,030 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-06 00:44:32,035 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-06 00:44:32,035 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-06 00:44:32,043 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-06 00:44:32,049 [ scc.git] DEBUG Already up to date.
2024-08-06 00:44:32,049 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-06 00:44:32,560 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-06 00:44:32,560 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-06 00:44:32,564 [ scc.git] DEBUG ## Unique users: []
2024-08-06 00:44:32,564 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:32,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:32,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-06 00:44:32,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:32,586 [ 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-06 00:44:32,622 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-06 00:44:32,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-06 00:44:32,622 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-06 00:44:32,622 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-06 00:44:32,630 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-06 00:44:32,638 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-06 00:44:32,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:32,772 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-06 00:44:32,780 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-06 00:44:32,787 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#144](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-06 00:44:32,794 [ scc.config] DEBUG Found github.token
2024-08-06 00:44:32,794 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-06 00:44:32,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-06 00:44:32,834 [ scc.git] DEBUG Get sha1 of %s
2024-08-06 00:44:32,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-06 00:44:32,841 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:32,882 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:32,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e3462a970> has no local changes
2024-08-06 00:44:32,892 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:32,902 [ scc.git] DEBUG [detached HEAD bfd4445] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:32,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:32,903 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-06 00:44:32,981 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-06 00:44:33,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:33,184 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-06 00:44:33,191 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-06 00:44:33,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:33,562 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-06 00:44:33,569 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-06 00:44:33,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:33,949 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-06 00:44:33,956 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-06 00:44:34,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:34,349 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-06 00:44:34,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:34,743 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-06 00:44:34,749 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-06 00:44:35,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:35,121 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-06 00:44:35,127 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-06 00:44:35,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:35,515 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-06 00:44:35,522 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-06 00:44:35,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:35,890 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-06 00:44:35,895 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-06 00:44:36,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:36,292 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-06 00:44:36,298 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-06 00:44:36,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:36,675 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-06 00:44:36,681 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-06 00:44:37,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:37,055 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-06 00:44:37,061 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-06 00:44:37,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:37,449 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-06 00:44:37,454 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-06 00:44:37,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:37,837 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-06 00:44:38,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:38,234 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-06 00:44:38,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:38,611 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-06 00:44:38,617 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-06 00:44:39,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:39,026 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-06 00:44:39,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:39,444 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-06 00:44:39,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:39,832 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-06 00:44:39,839 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-06 00:44:40,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:40,227 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-06 00:44:40,232 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-06 00:44:40,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:40,625 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-06 00:44:40,631 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-06 00:44:41,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:41,034 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-06 00:44:41,040 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-06 00:44:41,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-06 00:44:41,415 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-06 00:44:41,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-06 00:44:41,502 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3e3685f070> has local changes
2024-08-06 00:44:41,503 [ 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#144 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/144/)'
2024-08-06 00:44:41,521 [ scc.git] DEBUG [detached HEAD e5d4d57] merge master -Dorg -Ssuccess-only
2024-08-06 00:44:41,522 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-06 00:44:41,522 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-06 00:44:41,522 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-06 00:44:41,523 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-06 00:44:41,523 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-06 00:44:41,523 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-06 00:44:41,523 [ scc.merge] INFO
2024-08-06 00:44:41,523 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-06 00:44:41,523 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-06 00:44:41,523 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-06 00:44:41,524 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,524 [ scc.merge] INFO
2024-08-06 00:44:41,524 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-06 00:44:41,524 [ scc.merge] INFO
2024-08-06 00:44:41,524 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-06 00:44:41,524 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-06 00:44:41,524 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,524 [ scc.merge] INFO
2024-08-06 00:44:41,524 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-06 00:44:41,524 [ scc.merge] INFO
2024-08-06 00:44:41,524 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-06 00:44:41,524 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-06 00:44:41,525 [ scc.merge] INFO
2024-08-06 00:44:41,525 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-06 00:44:41,525 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-06 00:44:41,525 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,525 [ scc.merge] INFO
2024-08-06 00:44:41,525 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-06 00:44:41,525 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-06 00:44:41,525 [ scc.merge] INFO
2024-08-06 00:44:41,525 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-06 00:44:41,525 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,525 [ scc.merge] INFO
2024-08-06 00:44:41,525 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-06 00:44:41,526 [ scc.merge] INFO
2024-08-06 00:44:41,526 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-06 00:44:41,526 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,526 [ scc.merge] INFO
2024-08-06 00:44:41,526 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-06 00:44:41,526 [ scc.merge] INFO
2024-08-06 00:44:41,526 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-06 00:44:41,526 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-06 00:44:41,526 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,526 [ scc.merge] INFO
2024-08-06 00:44:41,526 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-06 00:44:41,526 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-06 00:44:41,526 [ scc.merge] INFO
2024-08-06 00:44:41,526 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-06 00:44:41,527 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-06 00:44:41,527 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,527 [ scc.merge] INFO
2024-08-06 00:44:41,527 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-06 00:44:41,527 [ scc.merge] INFO
2024-08-06 00:44:41,527 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-06 00:44:41,527 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,527 [ scc.merge] INFO
2024-08-06 00:44:41,527 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-06 00:44:41,527 [ scc.merge] INFO
2024-08-06 00:44:41,527 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-06 00:44:41,527 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-06 00:44:41,527 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-06 00:44:41,527 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-06 00:44:41,528 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-06 00:44:41,528 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-06 00:44:41,528 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,528 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-06 00:44:41,528 [ scc.merge] INFO
2024-08-06 00:44:41,528 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-06 00:44:41,529 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,529 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-06 00:44:41,529 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Merged PRs:
2024-08-06 00:44:41,529 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-06 00:44:41,529 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-06 00:44:41,529 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO
2024-08-06 00:44:41,529 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-06 00:44:41,529 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,529 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-06 00:44:41,530 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,530 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-06 00:44:41,530 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-06 00:44:41,530 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-06 00:44:41,530 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,530 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-06 00:44:41,530 [ scc.merge] INFO
2024-08-06 00:44:41,530 [ scc.merge] INFO Repository: ome/scripts
2024-08-06 00:44:41,530 [ scc.merge] INFO Excluded PRs:
2024-08-06 00:44:41,530 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-06 00:44:41,530 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-06 00:44:41,531 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-06 00:44:41,531 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-06 00:44:41,531 [ scc.merge] INFO Already up to date.
2024-08-06 00:44:41,531 [ scc.merge] INFO
2024-08-06 00:44:41,531 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-06 00:44:41,531 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-06 00:44:41,531 [ scc.merge] INFO
2024-08-06 00:44:41,531 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-06 00:44:41,531 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-06 00:44:41,539 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-06 00:44:41,547 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-06 00:44:41,555 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-06 00:44:41,563 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-06 00:44:41,572 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-06 00:44:41,582 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-06 00:44:41,591 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-06 00:44:41,600 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-06 00:44:41,607 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-06 00:44:41,612 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-06 00:44:41,617 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-06 00:44:41,622 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-06 00:44:41,628 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-06 00:44:41,634 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-06 00:44:41,640 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-06 00:44:41,645 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-06 00:44:41,651 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-06 00:44:41,658 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-06 00:44:41,683 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-06 00:44:41,691 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-06 00:44:41,698 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-06 00:44:41,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-06 00:44:41,704 [ scc.git] DEBUG Calling 'git remote'
2024-08-06 00:44:41,710 [ 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 854ebbe] 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 d21bde6] 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-06 00:45:28,934 [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-06 00:45:37,534 [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-06 00:45:39,835 [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-06 00:45:44,218 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-06 00:46:26,723 [ 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}
