Console Output
Skipping 93 KB..
Full Log2024-08-04 00:41:35,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-04 00:41:35,739 [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-04 00:41:36,237 [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-04 00:41:36,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-04 00:41:37,144 [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-04 00:41:37,145 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-04 00:41:37,146 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:41:37,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-04 00:41:37,147 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:37,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:37,153 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:41:37,159 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:41:37,159 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:41:37,166 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:41:37,175 [ scc.git] DEBUG Already up to date.
2024-08-04 00:41:37,176 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-04 00:41:37,615 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-04 00:41:37,615 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-04 00:41:37,621 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-04 00:41:38,266 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-04 00:41:38,267 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-04 00:41:38,273 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-04 00:41:39,453 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-04 00:41:39,454 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-04 00:41:39,459 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-04 00:41:39,771 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-04 00:41:39,772 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-04 00:41:39,776 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-04 00:41:40,399 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-04 00:41:40,399 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-04 00:41:40,405 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:41:40,405 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:40,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:40,413 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-04 00:41:40,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:40,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-04 00:41:40,527 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-04 00:41:40,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-04 00:41:40,534 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-04 00:41:40,534 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-04 00:41:40,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:40,718 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-04 00:41:40,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:40,733 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-04 00:41:41,044 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-04 00:41:41,044 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-04 00:41:41,044 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-04 00:41:41,044 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-04 00:41:41,045 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:41,053 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-04 00:41:41,053 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-04 00:41:41,054 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-04 00:41:41,054 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-04 00:41:41,054 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-04 00:41:41,056 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-04 00:41:41,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:41,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-04 00:41:41,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:41,206 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-04 00:41:41,616 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-04 00:41:41,617 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-04 00:41:41,617 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-04 00:41:41,617 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-04 00:41:41,617 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-04 00:41:41,617 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-04 00:41:41,617 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:41,625 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-04 00:41:41,625 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-04 00:41:41,625 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/index.html | 1 +
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-04 00:41:41,625 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-04 00:41:41,627 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-04 00:41:41,627 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-04 00:41:41,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:41,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-04 00:41:41,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:41,773 [ 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-04 00:41:41,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:41,815 [ scc.git] DEBUG setup.py | 2 +-
2024-08-04 00:41:41,815 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-04 00:41:42,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:42,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-04 00:41:42,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:42,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-04 00:41:42,341 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-04 00:41:42,341 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-04 00:41:42,343 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:42,348 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-04 00:41:42,349 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-04 00:41:42,349 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-04 00:41:42,349 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-04 00:41:42,349 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-04 00:41:42,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:42,587 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:41:42,629 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:42,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:42,635 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:41:42,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:41:42,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8cc8490> has no local changes
2024-08-04 00:41:42,687 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:41:42,715 [ scc.git] DEBUG [detached HEAD a7b72ab7] merge master -Dorg -Ssuccess-only
2024-08-04 00:41:42,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:41:42,716 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:41:43,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-04 00:41:43,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-04 00:41:43,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-04 00:41:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-04 00:41:44,883 [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-04 00:41:45,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-04 00:41:45,688 [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-04 00:41:45,688 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-04 00:41:45,689 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:41:45,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-04 00:41:45,689 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:45,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:45,704 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:41:45,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:41:45,709 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:41:45,715 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:41:45,720 [ scc.git] DEBUG Already up to date.
2024-08-04 00:41:45,721 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-04 00:41:46,067 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-04 00:41:46,067 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-04 00:41:46,072 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:41:46,073 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:46,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:46,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-04 00:41:46,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:46,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-04 00:41:46,125 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-04 00:41:46,126 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:46,129 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-04 00:41:46,129 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-04 00:41:46,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:46,298 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:41:46,339 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:46,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:46,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:41:46,382 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:41:46,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8d037c0> has no local changes
2024-08-04 00:41:46,389 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:41:46,397 [ scc.git] DEBUG [detached HEAD 4ca9b21] merge master -Dorg -Ssuccess-only
2024-08-04 00:41:46,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:41:46,398 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:41:46,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-04 00:41:47,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-04 00:41:47,183 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:41:48,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-04 00:41:48,751 [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-04 00:41:49,237 [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-04 00:41:49,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-04 00:41:50,092 [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-04 00:41:50,093 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-04 00:41:50,094 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:41:50,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-04 00:41:50,094 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:50,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:50,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:41:50,108 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:41:50,108 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:41:50,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:41:50,122 [ scc.git] DEBUG Already up to date.
2024-08-04 00:41:50,122 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-04 00:41:50,415 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-04 00:41:50,415 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-04 00:41:50,420 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:41:50,420 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:50,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:50,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-04 00:41:50,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:50,440 [ 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-04 00:41:50,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:41:50,458 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-04 00:41:50,458 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-04 00:41:50,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:41:50,594 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:41:50,638 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:41:50,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:41:50,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:41:50,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:41:50,698 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8ce8af0> has no local changes
2024-08-04 00:41:50,699 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:41:50,709 [ scc.git] DEBUG [detached HEAD 0db01d4] merge master -Dorg -Ssuccess-only
2024-08-04 00:41:50,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:41:50,710 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:41:51,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-04 00:41:51,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-04 00:41:52,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-04 00:41:52,060 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:41:52,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-04 00:41:53,114 [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-04 00:41:53,643 [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-04 00:41:54,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-04 00:41:54,611 [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-04 00:41:54,612 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-04 00:41:55,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-04 00:41:55,081 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:41:55,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-04 00:41:56,076 [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-04 00:41:56,542 [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-04 00:41:57,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-04 00:41:57,468 [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-04 00:41:57,469 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-04 00:41:57,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-04 00:41:58,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-04 00:41:58,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-04 00:41:59,326 [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-04 00:41:59,801 [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-04 00:42:00,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-04 00:42:00,671 [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-04 00:42:00,671 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-04 00:42:01,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-04 00:42:01,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-04 00:42:02,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-04 00:42:02,633 [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-04 00:42:03,126 [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-04 00:42:03,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-04 00:42:04,007 [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-04 00:42:04,008 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-04 00:42:04,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-04 00:42:04,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-04 00:42:05,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-04 00:42:05,812 [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-04 00:42:06,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-04 00:42:06,644 [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-04 00:42:06,645 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-04 00:42:06,645 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:06,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-04 00:42:06,646 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:06,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:06,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:06,660 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:06,660 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:06,725 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:06,733 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:06,733 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-04 00:42:07,245 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-04 00:42:07,246 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-04 00:42:07,251 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-04 00:42:08,308 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-04 00:42:08,308 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-04 00:42:08,314 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-04 00:42:08,697 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-04 00:42:08,698 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-04 00:42:08,703 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-04 00:42:09,007 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-04 00:42:09,007 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-04 00:42:09,013 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-04 00:42:09,294 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-04 00:42:09,294 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-04 00:42:09,298 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:09,299 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:09,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:09,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-04 00:42:09,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:09,315 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-04 00:42:09,379 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-04 00:42:09,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:09,384 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-04 00:42:09,384 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-04 00:42:09,384 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-04 00:42:09,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:09,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-04 00:42:09,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:09,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-04 00:42:09,749 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-04 00:42:09,749 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-04 00:42:09,749 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-04 00:42:09,749 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-04 00:42:09,767 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:09,772 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-04 00:42:09,772 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-04 00:42:09,772 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-04 00:42:09,772 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-04 00:42:09,772 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-04 00:42:09,773 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-04 00:42:09,773 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-04 00:42:09,773 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-04 00:42:09,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:09,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-04 00:42:09,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:09,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-04 00:42:10,032 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-04 00:42:10,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:10,036 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-04 00:42:10,036 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-04 00:42:10,036 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-04 00:42:10,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:10,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-04 00:42:10,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:10,364 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-04 00:42:10,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:10,429 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-04 00:42:10,429 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-04 00:42:10,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:10,709 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-04 00:42:10,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:10,745 [ 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-04 00:42:10,817 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-04 00:42:10,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:11,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:11,097 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:11,147 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:11,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:11,153 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:11,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:11,207 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8ce8d90> has no local changes
2024-08-04 00:42:11,207 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:11,218 [ scc.git] DEBUG [detached HEAD c48fb37] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:11,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:11,219 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:11,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-04 00:42:12,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-04 00:42:12,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-04 00:42:13,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-04 00:42:13,587 [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-04 00:42:14,106 [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-04 00:42:14,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-04 00:42:14,980 [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-04 00:42:14,981 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-04 00:42:14,981 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:14,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-04 00:42:14,981 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:14,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:14,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:14,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:14,994 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:15,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:15,006 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:15,006 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-04 00:42:15,307 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-04 00:42:15,307 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-04 00:42:15,312 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:15,312 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:15,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:15,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-04 00:42:15,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:15,330 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-04 00:42:15,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:15,344 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-04 00:42:15,344 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-04 00:42:15,344 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-04 00:42:15,344 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-04 00:42:15,344 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-04 00:42:15,344 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-04 00:42:15,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:15,480 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:15,520 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:15,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:15,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:15,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:15,572 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8477f70> has no local changes
2024-08-04 00:42:15,573 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:15,581 [ scc.git] DEBUG [detached HEAD c7ade8a] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:15,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:15,582 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:16,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-04 00:42:16,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-04 00:42:16,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-04 00:42:17,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-04 00:42:17,871 [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-04 00:42:18,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-04 00:42:18,738 [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-04 00:42:18,739 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-04 00:42:19,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-04 00:42:19,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-04 00:42:20,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-04 00:42:20,544 [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-04 00:42:21,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-04 00:42:21,412 [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-04 00:42:21,413 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-04 00:42:21,413 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:21,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-04 00:42:21,414 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:21,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:21,419 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:21,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:21,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:21,430 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:21,434 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:21,435 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-04 00:42:21,946 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-04 00:42:21,946 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-04 00:42:21,951 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-04 00:42:22,443 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-04 00:42:22,444 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-04 00:42:22,449 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:22,449 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:22,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:22,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-04 00:42:22,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:22,465 [ 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-04 00:42:22,521 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-04 00:42:22,521 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-04 00:42:22,521 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-04 00:42:22,521 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-04 00:42:22,521 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:42:22,521 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:42:22,527 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-04 00:42:22,534 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-04 00:42:22,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:22,664 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-04 00:42:22,672 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-04 00:42:22,677 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-04 00:42:22,681 [ scc.config] DEBUG Found github.token
2024-08-04 00:42:22,681 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-04 00:42:22,681 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-04 00:42:22,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:22,692 [ 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-04 00:42:22,721 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-04 00:42:22,721 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-04 00:42:22,721 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-04 00:42:22,722 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:42:22,722 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:42:22,728 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-04 00:42:22,735 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-04 00:42:23,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:23,042 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-04 00:42:23,049 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-04 00:42:23,055 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/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-04 00:42:23,059 [ scc.config] DEBUG Found github.token
2024-08-04 00:42:23,059 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-04 00:42:23,059 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:23,096 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:23,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:23,102 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:23,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:23,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8ca8d90> has no local changes
2024-08-04 00:42:23,150 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:23,158 [ scc.git] DEBUG [detached HEAD 9dc3801] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:23,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:23,159 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:23,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-04 00:42:24,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-04 00:42:24,065 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:42:24,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-04 00:42:25,092 [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-04 00:42:25,540 [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-04 00:42:26,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-04 00:42:26,455 [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-04 00:42:26,456 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-04 00:42:26,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-04 00:42:26,930 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:42:27,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-04 00:42:27,972 [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-04 00:42:28,413 [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-04 00:42:28,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-04 00:42:29,269 [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-04 00:42:29,270 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-04 00:42:29,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-04 00:42:29,707 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-04 00:42:30,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-04 00:42:30,744 [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-04 00:42:31,226 [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-04 00:42:31,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-04 00:42:32,145 [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-04 00:42:32,145 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-04 00:42:32,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-04 00:42:33,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-04 00:42:33,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-04 00:42:33,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-04 00:42:34,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-04 00:42:34,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-04 00:42:34,979 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:34,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-04 00:42:34,980 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:34,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:34,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:34,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:34,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:34,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:35,004 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:35,004 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-04 00:42:35,305 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-04 00:42:35,305 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-04 00:42:35,310 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-04 00:42:35,633 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-04 00:42:35,633 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-04 00:42:35,638 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-04 00:42:35,928 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-04 00:42:35,929 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-04 00:42:35,933 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:35,934 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:35,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:35,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-04 00:42:35,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:35,950 [ 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-04 00:42:35,959 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:35,962 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-04 00:42:35,962 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-04 00:42:36,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:36,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-04 00:42:36,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:36,128 [ 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-04 00:42:36,206 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-04 00:42:36,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:36,210 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-04 00:42:36,211 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-04 00:42:36,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:36,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-04 00:42:36,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:36,522 [ 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-04 00:42:36,547 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-04 00:42:36,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:36,551 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-04 00:42:36,551 [ scc.git] DEBUG package.json | 2 +-
2024-08-04 00:42:36,551 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-04 00:42:36,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:36,898 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:36,946 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:36,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:36,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:36,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:36,996 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e843b5b0> has no local changes
2024-08-04 00:42:36,996 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:37,004 [ scc.git] DEBUG [detached HEAD 53932d0] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:37,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:37,004 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:37,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-04 00:42:37,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-04 00:42:38,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-04 00:42:38,802 [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-04 00:42:39,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-04 00:42:39,678 [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-04 00:42:39,679 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-04 00:42:39,680 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:39,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-04 00:42:39,680 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:39,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:39,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:39,692 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:39,692 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:39,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:39,706 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:39,706 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-04 00:42:40,024 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-04 00:42:40,024 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-04 00:42:40,029 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:40,029 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:40,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:40,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-04 00:42:40,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:40,045 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-04 00:42:40,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:40,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:40,200 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:40,244 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:40,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:40,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:40,295 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:40,302 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8457e80> has no local changes
2024-08-04 00:42:40,302 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:40,311 [ scc.git] DEBUG [detached HEAD 89658be] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:40,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:40,312 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:40,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-04 00:42:41,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-04 00:42:41,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-04 00:42:42,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-04 00:42:42,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-04 00:42:42,967 [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-04 00:42:43,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-04 00:42:43,799 [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-04 00:42:43,799 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-04 00:42:43,800 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:43,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-04 00:42:43,800 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:43,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:43,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:43,811 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:43,811 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:43,816 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:43,821 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:43,822 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-04 00:42:44,407 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-04 00:42:44,407 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-04 00:42:44,412 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:44,412 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:44,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:44,419 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-04 00:42:44,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:44,432 [ 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-04 00:42:44,441 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-04 00:42:44,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:44,444 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-04 00:42:44,444 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-04 00:42:44,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:44,601 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:44,646 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:44,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:44,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:44,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:44,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83ccbb0> has no local changes
2024-08-04 00:42:44,702 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:44,711 [ scc.git] DEBUG [detached HEAD d6175f3] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:44,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:44,712 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:45,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-04 00:42:45,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-04 00:42:45,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-04 00:42:46,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-04 00:42:46,920 [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-04 00:42:47,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-04 00:42:47,809 [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-04 00:42:47,810 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-04 00:42:47,810 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:47,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-04 00:42:47,810 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:47,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:47,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:47,823 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:47,823 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:47,828 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:47,834 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:47,834 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-04 00:42:48,250 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-04 00:42:48,250 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-04 00:42:48,255 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:48,255 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:48,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:48,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-04 00:42:48,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:48,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-04 00:42:48,375 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-04 00:42:48,375 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG Auto-merging setup.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-04 00:42:48,376 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:42:48,376 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:42:48,384 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-04 00:42:48,390 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-04 00:42:48,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:48,565 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-04 00:42:48,572 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-04 00:42:48,579 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-08-04 00:42:48,584 [ scc.config] DEBUG Found github.token
2024-08-04 00:42:48,585 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-04 00:42:48,585 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:48,624 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:48,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:48,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:48,671 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:48,679 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e843b7f0> has no local changes
2024-08-04 00:42:48,679 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:48,688 [ scc.git] DEBUG [detached HEAD 267fef3] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:48,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:48,689 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:49,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-04 00:42:49,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-04 00:42:49,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-04 00:42:50,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-04 00:42:50,874 [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-04 00:42:51,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-04 00:42:51,697 [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-04 00:42:51,697 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-04 00:42:51,698 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:51,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-04 00:42:51,698 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:51,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:51,704 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:51,711 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:51,711 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:51,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:51,725 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:51,726 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-04 00:42:52,138 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-04 00:42:52,138 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-04 00:42:52,143 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:52,144 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:52,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-04 00:42:52,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,162 [ 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-04 00:42:52,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-04 00:42:52,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-04 00:42:52,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-04 00:42:52,194 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-04 00:42:52,194 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-04 00:42:52,195 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-04 00:42:52,195 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-04 00:42:52,195 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-04 00:42:52,195 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-04 00:42:52,195 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-04 00:42:52,195 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-04 00:42:52,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:52,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:52,377 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:52,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,384 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:52,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:52,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e8431ca0> has no local changes
2024-08-04 00:42:52,432 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:52,441 [ scc.git] DEBUG [detached HEAD 588884c] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:52,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:52,441 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:52,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-04 00:42:52,745 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:52,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-04 00:42:52,745 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:52,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,752 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:52,757 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:52,757 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:52,763 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:52,768 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:52,768 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:52,769 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:52,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,774 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:52,816 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:52,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:52,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:52,866 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:52,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83a52b0> has no local changes
2024-08-04 00:42:52,875 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:52,888 [ scc.git] DEBUG [detached HEAD e214710] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:52,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:52,889 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:53,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-04 00:42:53,150 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:53,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-04 00:42:53,151 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:53,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:53,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:53,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:53,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:53,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:53,185 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:53,185 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:53,185 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:53,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:53,191 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:53,233 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:53,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:53,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:53,278 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:53,284 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83edd60> has no local changes
2024-08-04 00:42:53,284 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:53,292 [ scc.git] DEBUG [detached HEAD 9356cf4] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:53,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:53,293 [ scc.git] INFO Overriding base-branch from master to main
2024-08-04 00:42:53,293 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:53,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-04 00:42:54,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-04 00:42:54,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-04 00:42:54,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-04 00:42:55,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-04 00:42:55,985 [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-04 00:42:56,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-04 00:42:56,868 [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-04 00:42:56,869 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-04 00:42:56,869 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:56,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-04 00:42:56,869 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:56,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:56,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-04 00:42:56,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:56,880 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-04 00:42:56,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-04 00:42:56,890 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:56,890 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-04 00:42:57,261 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-04 00:42:57,262 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-04 00:42:57,266 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:57,266 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:57,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-04 00:42:57,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,282 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-04 00:42:57,302 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-04 00:42:57,303 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-04 00:42:57,303 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:42:57,303 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:42:57,310 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-04 00:42:57,317 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-04 00:42:57,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:42:57,475 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-04 00:42:57,481 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-04 00:42:57,487 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-04 00:42:57,492 [ scc.config] DEBUG Found github.token
2024-08-04 00:42:57,492 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-04 00:42:57,493 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:57,530 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:57,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:57,574 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:57,580 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e84069a0> has no local changes
2024-08-04 00:42:57,580 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:57,596 [ scc.git] DEBUG [detached HEAD 8c6df3d] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:57,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:57,597 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:57,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-04 00:42:57,882 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:57,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-04 00:42:57,882 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:57,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:57,894 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:57,894 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:57,901 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:57,907 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:57,907 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:57,907 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:57,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,912 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:57,951 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:57,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:57,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:57,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:57,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83917c0> has no local changes
2024-08-04 00:42:57,999 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:58,006 [ scc.git] DEBUG [detached HEAD 1519b46] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:58,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:58,006 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:58,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-04 00:42:58,294 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:42:58,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-04 00:42:58,294 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:58,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:58,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:42:58,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:42:58,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:42:58,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:42:58,316 [ scc.git] DEBUG Already up to date.
2024-08-04 00:42:58,316 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:42:58,316 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:58,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:58,320 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:42:58,358 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:42:58,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:42:58,363 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:42:58,401 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:42:58,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83c74f0> has no local changes
2024-08-04 00:42:58,408 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:42:58,416 [ scc.git] DEBUG [detached HEAD 8d5fd69] merge master -Dorg -Ssuccess-only
2024-08-04 00:42:58,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:42:58,417 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:42:58,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-04 00:42:59,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-04 00:42:59,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-04 00:43:00,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-04 00:43:00,566 [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-04 00:43:01,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-04 00:43:01,421 [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-04 00:43:01,422 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-04 00:43:01,422 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:43:01,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-04 00:43:01,422 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:01,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:01,428 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-04 00:43:01,433 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:43:01,433 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-04 00:43:01,439 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-04 00:43:01,444 [ scc.git] DEBUG Already up to date.
2024-08-04 00:43:01,444 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-04 00:43:01,818 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-04 00:43:01,819 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-04 00:43:01,825 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:43:01,825 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:01,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:01,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-04 00:43:01,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:01,843 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-04 00:43:01,912 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-04 00:43:01,913 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-04 00:43:01,913 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:43:01,913 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:43:01,919 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-04 00:43:01,926 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-04 00:43:02,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:02,059 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-04 00:43:02,066 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-04 00:43:02,073 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-04 00:43:02,079 [ scc.config] DEBUG Found github.token
2024-08-04 00:43:02,079 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-04 00:43:02,080 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:43:02,120 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:02,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:02,126 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:43:02,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:43:02,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e83aedf0> has no local changes
2024-08-04 00:43:02,172 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:43:02,182 [ scc.git] DEBUG [detached HEAD 14f84c9] merge master -Dorg -Ssuccess-only
2024-08-04 00:43:02,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:02,182 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-04 00:43:02,182 [ scc.repo] DEBUG ## PRs found:
2024-08-04 00:43:02,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-04 00:43:03,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-04 00:43:03,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-04 00:43:04,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-04 00:43:04,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-04 00:43:04,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-04 00:43:05,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-04 00:43:05,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-04 00:43:06,374 [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-04 00:43:06,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-04 00:43:07,174 [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-04 00:43:07,175 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-04 00:43:07,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-04 00:43:08,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-04 00:43:08,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-04 00:43:09,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-04 00:43:09,067 [ scc.repo] DEBUG ## Branches found:
2024-08-04 00:43:09,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-04 00:43:09,068 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:09,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:09,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-04 00:43:09,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-04 00:43:09,080 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-04 00:43:09,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-04 00:43:09,090 [ scc.git] DEBUG Already up to date.
2024-08-04 00:43:09,090 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-04 00:43:09,481 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-04 00:43:09,481 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-04 00:43:09,486 [ scc.git] DEBUG ## Unique users: []
2024-08-04 00:43:09,486 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:09,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:09,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-04 00:43:09,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:09,501 [ 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-04 00:43:09,573 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-04 00:43:09,573 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-04 00:43:09,573 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-04 00:43:09,574 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-04 00:43:09,580 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-04 00:43:09,586 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-04 00:43:09,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:09,726 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-04 00:43:09,733 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-04 00:43:09,740 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#142](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-04 00:43:09,746 [ scc.config] DEBUG Found github.token
2024-08-04 00:43:09,747 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-04 00:43:09,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-04 00:43:09,791 [ scc.git] DEBUG Get sha1 of %s
2024-08-04 00:43:09,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-04 00:43:09,798 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:43:09,840 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:43:09,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e836b970> has no local changes
2024-08-04 00:43:09,847 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:43:09,855 [ scc.git] DEBUG [detached HEAD 983df26] merge master -Dorg -Ssuccess-only
2024-08-04 00:43:09,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:09,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-04 00:43:09,931 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-04 00:43:10,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:10,124 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-04 00:43:10,133 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-04 00:43:10,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:10,514 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-04 00:43:10,518 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-04 00:43:10,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:10,932 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-04 00:43:10,938 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-04 00:43:11,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:11,331 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-04 00:43:11,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:11,722 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-04 00:43:11,727 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-04 00:43:12,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:12,108 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-04 00:43:12,113 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-04 00:43:12,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:12,498 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-04 00:43:12,504 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-04 00:43:12,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:12,877 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-04 00:43:12,882 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-04 00:43:13,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:13,264 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-04 00:43:13,270 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-04 00:43:13,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:13,650 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-04 00:43:13,655 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-04 00:43:14,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:14,038 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-04 00:43:14,044 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-04 00:43:14,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:14,415 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-04 00:43:14,420 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-04 00:43:14,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:14,819 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-04 00:43:15,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:15,201 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-04 00:43:15,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:15,616 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-04 00:43:15,622 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-04 00:43:15,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:16,003 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-04 00:43:16,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:16,389 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-04 00:43:16,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:16,776 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-04 00:43:16,781 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-04 00:43:17,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:17,171 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-04 00:43:17,176 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-04 00:43:17,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:17,560 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-04 00:43:17,564 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-04 00:43:17,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:17,942 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-04 00:43:17,948 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-04 00:43:18,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-04 00:43:18,331 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-04 00:43:18,331 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-04 00:43:18,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44e9da0070> has local changes
2024-08-04 00:43:18,405 [ 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#142 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/142/)'
2024-08-04 00:43:18,419 [ scc.git] DEBUG [detached HEAD 4ed173f] merge master -Dorg -Ssuccess-only
2024-08-04 00:43:18,419 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-04 00:43:18,419 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-04 00:43:18,419 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-04 00:43:18,420 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-04 00:43:18,420 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-04 00:43:18,420 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-04 00:43:18,420 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-04 00:43:18,420 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-04 00:43:18,420 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-04 00:43:18,420 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,420 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,420 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-04 00:43:18,420 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-04 00:43:18,421 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-04 00:43:18,421 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-04 00:43:18,421 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-04 00:43:18,421 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-04 00:43:18,421 [ scc.merge] INFO
2024-08-04 00:43:18,421 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-04 00:43:18,421 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-04 00:43:18,421 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-04 00:43:18,421 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-04 00:43:18,422 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-04 00:43:18,422 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-04 00:43:18,422 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-04 00:43:18,422 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-04 00:43:18,422 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-04 00:43:18,422 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,422 [ scc.merge] INFO
2024-08-04 00:43:18,422 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,422 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-04 00:43:18,423 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Merged PRs:
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-04 00:43:18,423 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,423 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,423 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-04 00:43:18,423 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,423 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-04 00:43:18,424 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-04 00:43:18,424 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO Repository: ome/scripts
2024-08-04 00:43:18,424 [ scc.merge] INFO Excluded PRs:
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-04 00:43:18,424 [ scc.merge] INFO Already up to date.
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-04 00:43:18,424 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-04 00:43:18,424 [ scc.merge] INFO
2024-08-04 00:43:18,424 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-04 00:43:18,424 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-04 00:43:18,429 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-04 00:43:18,434 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-04 00:43:18,438 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-04 00:43:18,442 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-04 00:43:18,447 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-04 00:43:18,451 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-04 00:43:18,456 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-04 00:43:18,460 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-04 00:43:18,465 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-04 00:43:18,469 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-04 00:43:18,474 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-04 00:43:18,478 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-04 00:43:18,482 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-04 00:43:18,488 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-04 00:43:18,494 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-04 00:43:18,499 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-04 00:43:18,504 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-04 00:43:18,508 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-04 00:43:18,513 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-04 00:43:18,517 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-04 00:43:18,521 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-04 00:43:18,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-04 00:43:18,526 [ scc.git] DEBUG Calling 'git remote'
2024-08-04 00:43:18,530 [ 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 2f6301f] 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 98942e0] 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-04 00:44:03,269 [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-04 00:44:11,902 [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-04 00:44:14,139 [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-04 00:44:18,563 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-04 00:44:58,162 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/28c89a1b/images/svgs/logo.svg){kind=logo}
