Console Output
Skipping 93 KB..
Full Log2024-08-08 00:44:03,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-08 00:44:03,556 [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-08 00:44:04,037 [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-08 00:44:04,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-08 00:44:05,018 [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-08 00:44:05,019 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-08 00:44:05,020 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:05,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-08 00:44:05,020 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:05,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:05,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:05,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:05,036 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:05,044 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:05,052 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:05,052 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-08 00:44:05,442 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-08 00:44:05,442 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-08 00:44:05,448 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-08 00:44:05,883 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-08 00:44:05,883 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-08 00:44:05,888 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-08 00:44:06,807 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-08 00:44:06,807 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-08 00:44:06,813 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-08 00:44:07,176 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-08 00:44:07,176 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-08 00:44:07,182 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-08 00:44:07,697 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-08 00:44:07,697 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-08 00:44:07,704 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:07,704 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:07,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:07,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-08 00:44:07,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:07,728 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-08 00:44:07,747 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-08 00:44:07,748 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:07,754 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-08 00:44:07,755 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-08 00:44:07,758 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-08 00:44:07,758 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-08 00:44:07,758 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-08 00:44:07,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:07,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-08 00:44:07,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:07,927 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-08 00:44:08,008 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-08 00:44:08,008 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-08 00:44:08,008 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-08 00:44:08,008 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-08 00:44:08,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:08,018 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-08 00:44:08,018 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-08 00:44:08,019 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-08 00:44:08,019 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-08 00:44:08,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:08,296 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-08 00:44:08,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:08,314 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-08 00:44:08,461 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-08 00:44:08,462 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-08 00:44:08,462 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-08 00:44:08,462 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-08 00:44:08,462 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-08 00:44:08,462 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-08 00:44:08,463 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:08,475 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-08 00:44:08,475 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-08 00:44:08,475 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/index.html | 1 +
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-08 00:44:08,475 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-08 00:44:08,475 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-08 00:44:08,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:08,696 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-08 00:44:08,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:08,716 [ 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-08 00:44:08,750 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:08,754 [ scc.git] DEBUG setup.py | 2 +-
2024-08-08 00:44:08,754 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-08 00:44:09,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:09,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-08 00:44:09,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:09,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-08 00:44:09,527 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-08 00:44:09,528 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-08 00:44:09,528 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:09,533 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-08 00:44:09,534 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-08 00:44:09,534 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-08 00:44:09,536 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-08 00:44:09,537 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-08 00:44:09,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:09,665 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:09,711 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:09,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:09,717 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:09,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:09,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2946774f0> has no local changes
2024-08-08 00:44:09,768 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:09,780 [ scc.git] DEBUG [detached HEAD 1c2119ad] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:09,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:09,780 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:10,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-08 00:44:10,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-08 00:44:11,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-08 00:44:11,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-08 00:44:12,016 [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-08 00:44:12,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-08 00:44:12,973 [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-08 00:44:12,974 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-08 00:44:12,974 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:12,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-08 00:44:12,974 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:12,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:12,981 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:12,986 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:12,986 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:12,992 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:12,999 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:12,999 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-08 00:44:13,327 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-08 00:44:13,328 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-08 00:44:13,332 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:13,333 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:13,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:13,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-08 00:44:13,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:13,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-08 00:44:13,386 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-08 00:44:13,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:13,395 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-08 00:44:13,396 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-08 00:44:13,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:13,536 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:13,576 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:13,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:13,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:13,623 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:13,630 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2966d8700> has no local changes
2024-08-08 00:44:13,630 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:13,639 [ scc.git] DEBUG [detached HEAD bd05e9a] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:13,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:13,639 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:14,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-08 00:44:14,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-08 00:44:14,479 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:15,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-08 00:44:15,645 [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-08 00:44:16,147 [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-08 00:44:16,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-08 00:44:17,085 [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-08 00:44:17,086 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-08 00:44:17,086 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:17,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-08 00:44:17,086 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:17,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:17,093 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:17,100 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:17,100 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:17,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:17,115 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:17,115 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-08 00:44:17,444 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-08 00:44:17,445 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-08 00:44:17,450 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:17,450 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:17,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:17,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-08 00:44:17,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:17,466 [ 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-08 00:44:17,478 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:17,482 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-08 00:44:17,482 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-08 00:44:17,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:17,624 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:17,663 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:17,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:17,669 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:17,708 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:17,717 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc29671fb50> has no local changes
2024-08-08 00:44:17,717 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:17,727 [ scc.git] DEBUG [detached HEAD 210d2bb] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:17,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:17,728 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:18,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-08 00:44:18,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-08 00:44:19,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-08 00:44:19,114 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:19,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-08 00:44:20,264 [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-08 00:44:20,839 [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-08 00:44:21,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-08 00:44:21,776 [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-08 00:44:21,777 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-08 00:44:22,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-08 00:44:22,268 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:22,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-08 00:44:23,375 [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-08 00:44:23,908 [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-08 00:44:24,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-08 00:44:24,742 [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-08 00:44:24,743 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-08 00:44:25,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-08 00:44:25,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-08 00:44:26,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-08 00:44:26,704 [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-08 00:44:27,156 [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-08 00:44:27,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-08 00:44:28,065 [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-08 00:44:28,066 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-08 00:44:28,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-08 00:44:28,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-08 00:44:29,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-08 00:44:29,927 [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-08 00:44:30,395 [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-08 00:44:30,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-08 00:44:31,297 [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-08 00:44:31,298 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-08 00:44:31,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-08 00:44:32,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-08 00:44:32,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-08 00:44:33,131 [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-08 00:44:33,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-08 00:44:34,050 [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-08 00:44:34,051 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-08 00:44:34,052 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:34,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-08 00:44:34,052 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:34,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:34,060 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:34,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:34,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:34,074 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:34,081 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:34,082 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-08 00:44:34,456 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-08 00:44:34,456 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-08 00:44:34,462 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-08 00:44:35,361 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-08 00:44:35,361 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-08 00:44:35,368 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-08 00:44:35,753 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-08 00:44:35,753 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-08 00:44:35,759 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-08 00:44:36,058 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-08 00:44:36,058 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-08 00:44:36,063 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-08 00:44:36,372 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-08 00:44:36,373 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-08 00:44:36,378 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:36,379 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:36,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:36,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-08 00:44:36,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:36,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-08 00:44:36,450 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-08 00:44:36,451 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:36,455 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-08 00:44:36,455 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-08 00:44:36,455 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-08 00:44:36,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:36,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-08 00:44:36,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:36,606 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-08 00:44:36,716 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-08 00:44:36,717 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-08 00:44:36,717 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-08 00:44:36,717 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-08 00:44:36,717 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:36,725 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-08 00:44:36,726 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-08 00:44:36,726 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-08 00:44:36,726 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-08 00:44:36,726 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-08 00:44:36,726 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-08 00:44:36,726 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-08 00:44:36,726 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-08 00:44:36,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:36,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-08 00:44:36,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:36,984 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-08 00:44:36,999 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-08 00:44:37,000 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:37,004 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-08 00:44:37,004 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-08 00:44:37,004 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-08 00:44:37,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:37,351 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-08 00:44:37,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:37,374 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-08 00:44:37,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:37,432 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-08 00:44:37,432 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-08 00:44:37,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:37,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-08 00:44:37,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:37,772 [ 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-08 00:44:37,828 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-08 00:44:37,830 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:38,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:38,154 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:38,203 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:38,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:38,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:38,255 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:38,267 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2966c6be0> has no local changes
2024-08-08 00:44:38,267 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:38,278 [ scc.git] DEBUG [detached HEAD 3867a60] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:38,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:38,278 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:38,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-08 00:44:39,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-08 00:44:39,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-08 00:44:40,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-08 00:44:40,668 [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-08 00:44:41,140 [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-08 00:44:41,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-08 00:44:42,041 [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-08 00:44:42,043 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-08 00:44:42,043 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:42,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-08 00:44:42,043 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:42,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:42,052 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:42,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:42,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:42,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:42,072 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:42,073 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-08 00:44:42,385 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-08 00:44:42,386 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-08 00:44:42,391 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:42,391 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:42,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:42,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-08 00:44:42,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:42,412 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-08 00:44:42,423 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:44:42,426 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-08 00:44:42,426 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-08 00:44:42,426 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-08 00:44:42,426 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-08 00:44:42,426 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-08 00:44:42,426 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-08 00:44:42,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:42,562 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:42,608 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:42,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:42,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:42,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:42,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2966cd6d0> has no local changes
2024-08-08 00:44:42,681 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:42,691 [ scc.git] DEBUG [detached HEAD fc70e1d] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:42,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:42,692 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:43,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-08 00:44:43,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-08 00:44:44,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-08 00:44:44,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-08 00:44:44,980 [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-08 00:44:45,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-08 00:44:45,898 [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-08 00:44:45,899 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-08 00:44:46,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-08 00:44:46,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-08 00:44:47,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-08 00:44:47,772 [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-08 00:44:48,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-08 00:44:48,653 [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-08 00:44:48,654 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-08 00:44:48,654 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:44:48,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-08 00:44:48,654 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:48,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:48,661 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:44:48,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:44:48,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:44:48,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:44:48,684 [ scc.git] DEBUG Already up to date.
2024-08-08 00:44:48,684 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-08 00:44:49,118 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-08 00:44:49,118 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-08 00:44:49,124 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-08 00:44:49,521 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-08 00:44:49,521 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-08 00:44:49,527 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:44:49,528 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:49,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:49,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-08 00:44:49,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:49,549 [ 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-08 00:44:49,583 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-08 00:44:49,583 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-08 00:44:49,583 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-08 00:44:49,583 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-08 00:44:49,584 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:44:49,585 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:44:49,591 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-08 00:44:49,599 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-08 00:44:49,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:49,735 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-08 00:44:49,743 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-08 00:44:49,750 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-08 00:44:49,756 [ scc.config] DEBUG Found github.token
2024-08-08 00:44:49,756 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-08 00:44:49,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-08 00:44:49,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:49,770 [ 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-08 00:44:49,823 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-08 00:44:49,823 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-08 00:44:49,823 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-08 00:44:49,823 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:44:49,824 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:44:49,831 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-08 00:44:49,840 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-08 00:44:50,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:44:50,121 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-08 00:44:50,128 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-08 00:44:50,134 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/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-08 00:44:50,138 [ scc.config] DEBUG Found github.token
2024-08-08 00:44:50,139 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-08 00:44:50,139 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:44:50,178 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:44:50,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:44:50,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:44:50,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:44:50,229 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2946a3f40> has no local changes
2024-08-08 00:44:50,229 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:44:50,238 [ scc.git] DEBUG [detached HEAD f7d6da5] merge master -Dorg -Ssuccess-only
2024-08-08 00:44:50,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:44:50,238 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:44:50,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-08 00:44:51,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-08 00:44:51,100 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:51,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-08 00:44:52,167 [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-08 00:44:52,667 [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-08 00:44:53,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-08 00:44:53,588 [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-08 00:44:53,589 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-08 00:44:54,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-08 00:44:54,048 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:54,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-08 00:44:55,120 [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-08 00:44:55,581 [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-08 00:44:56,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-08 00:44:56,519 [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-08 00:44:56,521 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-08 00:44:56,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-08 00:44:56,986 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-08 00:44:57,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-08 00:44:58,025 [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-08 00:44:58,549 [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-08 00:44:58,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-08 00:44:59,373 [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-08 00:44:59,374 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-08 00:44:59,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-08 00:45:00,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-08 00:45:00,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-08 00:45:01,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-08 00:45:02,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-08 00:45:02,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-08 00:45:02,512 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:02,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-08 00:45:02,513 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:02,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:02,519 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:02,526 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:02,526 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:02,533 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:02,540 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:02,540 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-08 00:45:02,868 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-08 00:45:02,868 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-08 00:45:02,876 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-08 00:45:03,195 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-08 00:45:03,195 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-08 00:45:03,201 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-08 00:45:03,491 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-08 00:45:03,492 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-08 00:45:03,497 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:03,498 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:03,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:03,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-08 00:45:03,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:03,519 [ 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-08 00:45:03,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:03,535 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-08 00:45:03,535 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-08 00:45:03,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:03,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-08 00:45:03,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:03,693 [ 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-08 00:45:03,723 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-08 00:45:03,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:03,728 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-08 00:45:03,729 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-08 00:45:04,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:04,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-08 00:45:04,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:04,080 [ 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-08 00:45:04,104 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-08 00:45:04,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:04,109 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-08 00:45:04,109 [ scc.git] DEBUG package.json | 2 +-
2024-08-08 00:45:04,109 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-08 00:45:04,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:04,462 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:04,519 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:04,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:04,528 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:04,590 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:04,599 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294669580> has no local changes
2024-08-08 00:45:04,600 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:04,612 [ scc.git] DEBUG [detached HEAD 294af0f] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:04,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:04,612 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:04,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-08 00:45:05,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-08 00:45:05,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-08 00:45:06,357 [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-08 00:45:06,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-08 00:45:07,211 [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-08 00:45:07,212 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-08 00:45:07,212 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:07,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-08 00:45:07,212 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:07,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:07,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:07,224 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:07,225 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:07,233 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:07,240 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:07,241 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-08 00:45:07,583 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-08 00:45:07,584 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-08 00:45:07,591 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:07,591 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:07,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:07,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-08 00:45:07,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:07,616 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-08 00:45:07,628 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:07,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:07,814 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:07,859 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:07,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:07,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:07,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:07,916 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294688e80> has no local changes
2024-08-08 00:45:07,916 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:07,926 [ scc.git] DEBUG [detached HEAD e3b6c88] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:07,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:07,926 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:08,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-08 00:45:08,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-08 00:45:09,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-08 00:45:09,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-08 00:45:10,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-08 00:45:10,729 [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-08 00:45:11,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-08 00:45:11,725 [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-08 00:45:11,726 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-08 00:45:11,727 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:11,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-08 00:45:11,727 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:11,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:11,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:11,743 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:11,743 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:11,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:11,761 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:11,761 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-08 00:45:12,206 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-08 00:45:12,206 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-08 00:45:12,211 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:12,212 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:12,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:12,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-08 00:45:12,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:12,236 [ 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-08 00:45:12,263 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-08 00:45:12,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:12,267 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-08 00:45:12,267 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-08 00:45:12,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:12,416 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:12,465 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:12,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:12,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:12,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:12,536 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2945fcb50> has no local changes
2024-08-08 00:45:12,537 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:12,550 [ scc.git] DEBUG [detached HEAD 1b4a193] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:12,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:12,551 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:12,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-08 00:45:13,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-08 00:45:13,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-08 00:45:14,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-08 00:45:14,766 [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-08 00:45:15,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-08 00:45:15,745 [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-08 00:45:15,747 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-08 00:45:15,747 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:15,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-08 00:45:15,747 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:15,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:15,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:15,766 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:15,766 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:15,775 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:15,783 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:15,783 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-08 00:45:16,237 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-08 00:45:16,238 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-08 00:45:16,244 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:16,244 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:16,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:16,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-08 00:45:16,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:16,273 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-08 00:45:16,330 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-08 00:45:16,330 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-08 00:45:16,330 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-08 00:45:16,330 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-08 00:45:16,331 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-08 00:45:16,331 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-08 00:45:16,331 [ scc.git] DEBUG Auto-merging setup.py
2024-08-08 00:45:16,331 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-08 00:45:16,331 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:45:16,331 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:45:16,340 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-08 00:45:16,350 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-08 00:45:16,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:16,487 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-08 00:45:16,496 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-08 00:45:16,507 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-08-08 00:45:16,515 [ scc.config] DEBUG Found github.token
2024-08-08 00:45:16,515 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-08 00:45:16,515 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:16,566 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:16,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:16,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:16,620 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:16,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294669730> has no local changes
2024-08-08 00:45:16,629 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:16,640 [ scc.git] DEBUG [detached HEAD 7df73df] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:16,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:16,641 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:17,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-08 00:45:17,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-08 00:45:17,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-08 00:45:18,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-08 00:45:18,922 [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-08 00:45:19,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-08 00:45:19,763 [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-08 00:45:19,765 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-08 00:45:19,765 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:19,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-08 00:45:19,765 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:19,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:19,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:19,780 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:19,781 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:19,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:19,796 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:19,796 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-08 00:45:20,210 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-08 00:45:20,210 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-08 00:45:20,216 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:20,216 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:20,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-08 00:45:20,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,236 [ 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-08 00:45:20,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-08 00:45:20,253 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-08 00:45:20,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-08 00:45:20,256 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-08 00:45:20,257 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-08 00:45:20,257 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-08 00:45:20,257 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-08 00:45:20,258 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-08 00:45:20,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:20,389 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:20,431 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:20,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,438 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:20,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:20,489 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294635640> has no local changes
2024-08-08 00:45:20,489 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:20,500 [ scc.git] DEBUG [detached HEAD 4d845be] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:20,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:20,501 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:20,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-08 00:45:20,797 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:20,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-08 00:45:20,797 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:20,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,804 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:20,809 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:20,809 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:20,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:20,819 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:20,819 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:20,819 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:20,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,829 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:20,871 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:20,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:20,877 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:20,917 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:20,923 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2945cee80> has no local changes
2024-08-08 00:45:20,924 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:20,932 [ scc.git] DEBUG [detached HEAD 4320ad4] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:20,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:20,933 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:21,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-08 00:45:21,227 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:21,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-08 00:45:21,227 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:21,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:21,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:21,241 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:21,241 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:21,247 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:21,254 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:21,254 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:21,254 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:21,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:21,261 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:21,308 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:21,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:21,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:21,356 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:21,363 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294615d30> has no local changes
2024-08-08 00:45:21,363 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:21,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:21,374 [ scc.git] DEBUG [detached HEAD fc7b30f] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:21,374 [ scc.git] INFO Overriding base-branch from master to main
2024-08-08 00:45:21,374 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:21,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-08 00:45:22,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-08 00:45:22,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-08 00:45:23,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-08 00:45:23,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-08 00:45:24,081 [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-08 00:45:24,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-08 00:45:24,914 [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-08 00:45:24,915 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-08 00:45:24,916 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:24,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-08 00:45:24,916 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:24,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:24,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-08 00:45:24,930 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:24,930 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-08 00:45:24,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-08 00:45:24,949 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:24,949 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-08 00:45:25,263 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-08 00:45:25,264 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-08 00:45:25,269 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:25,270 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:25,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:25,276 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-08 00:45:25,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:25,290 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-08 00:45:25,414 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-08 00:45:25,415 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-08 00:45:25,415 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:45:25,415 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:45:25,422 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-08 00:45:25,429 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-08 00:45:25,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:25,570 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-08 00:45:25,577 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-08 00:45:25,585 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-08 00:45:25,593 [ scc.config] DEBUG Found github.token
2024-08-08 00:45:25,593 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-08 00:45:25,593 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:25,642 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:25,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:25,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:25,694 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:25,701 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294605f40> has no local changes
2024-08-08 00:45:25,702 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:25,711 [ scc.git] DEBUG [detached HEAD 60c0eba] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:25,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:25,712 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:25,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-08 00:45:25,972 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:25,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-08 00:45:25,972 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:25,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:25,981 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:25,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:25,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:25,994 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:26,001 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:26,001 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:26,001 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:26,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:26,007 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:26,051 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:26,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:26,059 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:26,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:26,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2945b97c0> has no local changes
2024-08-08 00:45:26,114 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:26,125 [ scc.git] DEBUG [detached HEAD 2a3f09d] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:26,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:26,125 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:26,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-08 00:45:26,421 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:26,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-08 00:45:26,421 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:26,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:26,428 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:26,434 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:26,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:26,442 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:26,449 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:26,449 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:26,449 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:26,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:26,455 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:26,501 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:26,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:26,508 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:26,555 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:26,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc294578490> has no local changes
2024-08-08 00:45:26,562 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:26,573 [ scc.git] DEBUG [detached HEAD f3af7e2] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:26,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:26,573 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:26,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-08 00:45:27,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-08 00:45:27,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-08 00:45:28,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-08 00:45:28,814 [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-08 00:45:29,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-08 00:45:29,731 [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-08 00:45:29,732 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-08 00:45:29,732 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:29,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-08 00:45:29,733 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:29,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:29,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-08 00:45:29,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:29,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-08 00:45:29,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-08 00:45:29,762 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:29,762 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-08 00:45:30,091 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-08 00:45:30,092 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-08 00:45:30,096 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:30,097 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:30,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:30,104 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-08 00:45:30,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:30,118 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-08 00:45:30,165 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-08 00:45:30,166 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-08 00:45:30,166 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:45:30,166 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:45:30,176 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-08 00:45:30,187 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-08 00:45:30,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:30,324 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-08 00:45:30,332 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-08 00:45:30,339 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-08 00:45:30,346 [ scc.config] DEBUG Found github.token
2024-08-08 00:45:30,347 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-08 00:45:30,347 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:30,391 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:30,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:30,398 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:30,443 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:30,451 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc29459a8b0> has no local changes
2024-08-08 00:45:30,451 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:30,462 [ scc.git] DEBUG [detached HEAD 00d6d73] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:30,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:30,463 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-08 00:45:30,463 [ scc.repo] DEBUG ## PRs found:
2024-08-08 00:45:30,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-08 00:45:31,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-08 00:45:31,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-08 00:45:32,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-08 00:45:32,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-08 00:45:33,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-08 00:45:33,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-08 00:45:34,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-08 00:45:34,583 [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-08 00:45:35,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-08 00:45:35,473 [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-08 00:45:35,474 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-08 00:45:35,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-08 00:45:36,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-08 00:45:36,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-08 00:45:37,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-08 00:45:37,387 [ scc.repo] DEBUG ## Branches found:
2024-08-08 00:45:37,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-08 00:45:37,387 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:37,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:37,393 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-08 00:45:37,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-08 00:45:37,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-08 00:45:37,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-08 00:45:37,409 [ scc.git] DEBUG Already up to date.
2024-08-08 00:45:37,409 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-08 00:45:37,813 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-08 00:45:37,813 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-08 00:45:37,818 [ scc.git] DEBUG ## Unique users: []
2024-08-08 00:45:37,819 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:37,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:37,827 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-08 00:45:37,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:37,843 [ 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-08 00:45:37,897 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-08 00:45:37,897 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-08 00:45:37,897 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-08 00:45:37,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-08 00:45:37,905 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-08 00:45:37,914 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-08 00:45:38,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:38,056 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-08 00:45:38,065 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-08 00:45:38,072 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#146](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-08 00:45:38,078 [ scc.config] DEBUG Found github.token
2024-08-08 00:45:38,078 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-08 00:45:38,079 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-08 00:45:38,126 [ scc.git] DEBUG Get sha1 of %s
2024-08-08 00:45:38,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-08 00:45:38,133 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:38,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:38,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc29459a5b0> has no local changes
2024-08-08 00:45:38,192 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:38,202 [ scc.git] DEBUG [detached HEAD 735f7a7] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:38,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:38,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-08 00:45:38,285 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-08 00:45:38,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:38,448 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-08 00:45:38,454 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-08 00:45:38,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:38,851 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-08 00:45:38,857 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-08 00:45:39,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:39,246 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-08 00:45:39,253 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-08 00:45:39,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:39,634 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-08 00:45:40,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:40,023 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-08 00:45:40,029 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-08 00:45:40,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:40,406 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-08 00:45:40,413 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-08 00:45:40,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:40,798 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-08 00:45:40,803 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-08 00:45:41,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:41,181 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-08 00:45:41,187 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-08 00:45:41,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:41,564 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-08 00:45:41,570 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-08 00:45:41,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:41,967 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-08 00:45:41,975 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-08 00:45:42,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:42,348 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-08 00:45:42,356 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-08 00:45:42,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:42,727 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-08 00:45:42,734 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-08 00:45:43,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:43,122 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-08 00:45:43,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:43,511 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-08 00:45:43,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:43,893 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-08 00:45:43,900 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-08 00:45:44,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:44,314 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-08 00:45:44,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:44,697 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-08 00:45:45,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:45,077 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-08 00:45:45,083 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-08 00:45:45,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:45,457 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-08 00:45:45,464 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-08 00:45:45,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:45,858 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-08 00:45:45,863 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-08 00:45:46,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:46,247 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-08 00:45:46,255 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-08 00:45:46,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-08 00:45:46,631 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-08 00:45:46,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-08 00:45:46,726 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2977d0790> has local changes
2024-08-08 00:45:46,726 [ 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#146 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/146/)'
2024-08-08 00:45:46,744 [ scc.git] DEBUG [detached HEAD 16459ab] merge master -Dorg -Ssuccess-only
2024-08-08 00:45:46,744 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-08 00:45:46,744 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-08 00:45:46,744 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,744 [ scc.merge] INFO
2024-08-08 00:45:46,744 [ scc.merge] INFO
2024-08-08 00:45:46,744 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-08 00:45:46,744 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-08 00:45:46,745 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-08 00:45:46,745 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-08 00:45:46,745 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-08 00:45:46,745 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-08 00:45:46,745 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-08 00:45:46,745 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-08 00:45:46,745 [ scc.merge] INFO
2024-08-08 00:45:46,745 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-08 00:45:46,745 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-08 00:45:46,745 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-08 00:45:46,746 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-08 00:45:46,746 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-08 00:45:46,746 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-08 00:45:46,746 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-08 00:45:46,746 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-08 00:45:46,746 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-08 00:45:46,746 [ scc.merge] INFO
2024-08-08 00:45:46,746 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-08 00:45:46,747 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-08 00:45:46,747 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-08 00:45:46,747 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-08 00:45:46,747 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-08 00:45:46,747 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-08 00:45:46,747 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-08 00:45:46,747 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-08 00:45:46,747 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,747 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,747 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-08 00:45:46,747 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,748 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Merged PRs:
2024-08-08 00:45:46,748 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-08 00:45:46,748 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,748 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,748 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,748 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-08 00:45:46,748 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,748 [ scc.merge] INFO
2024-08-08 00:45:46,749 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-08 00:45:46,749 [ scc.merge] INFO
2024-08-08 00:45:46,749 [ scc.merge] INFO Repository: ome/scripts
2024-08-08 00:45:46,749 [ scc.merge] INFO Excluded PRs:
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-08 00:45:46,749 [ scc.merge] INFO Already up to date.
2024-08-08 00:45:46,749 [ scc.merge] INFO
2024-08-08 00:45:46,749 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-08 00:45:46,749 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-08 00:45:46,749 [ scc.merge] INFO
2024-08-08 00:45:46,749 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-08 00:45:46,749 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-08 00:45:46,755 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-08 00:45:46,761 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-08 00:45:46,766 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-08 00:45:46,774 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-08 00:45:46,780 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-08 00:45:46,787 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-08 00:45:46,794 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-08 00:45:46,800 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-08 00:45:46,807 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-08 00:45:46,813 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-08 00:45:46,820 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-08 00:45:46,827 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-08 00:45:46,833 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-08 00:45:46,840 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-08 00:45:46,846 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-08 00:45:46,851 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-08 00:45:46,856 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-08 00:45:46,863 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-08 00:45:46,871 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-08 00:45:46,877 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-08 00:45:46,884 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-08 00:45:46,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-08 00:45:46,890 [ scc.git] DEBUG Calling 'git remote'
2024-08-08 00:45:46,896 [ 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 44db8c3] 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 f290fb7] 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-08 00:46:40,453 [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-08 00:46:50,845 [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-08 00:46:54,343 [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-08 00:47:01,897 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-08 00:47:58,120 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
