Skipping 112 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-08-02 00:42:50,857 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:42:50,864 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:42:50,864 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:42:50,872 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:42:50,880 [ scc.git] DEBUG Already up to date.
2024-08-02 00:42:50,881 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-02 00:42:51,288 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-02 00:42:51,288 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-02 00:42:51,294 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-02 00:42:51,820 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-02 00:42:51,820 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-02 00:42:51,826 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-02 00:42:52,581 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-02 00:42:52,581 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-02 00:42:52,587 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-02 00:42:52,962 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-02 00:42:52,962 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-02 00:42:52,968 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-02 00:42:53,379 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-02 00:42:53,379 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-02 00:42:53,384 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:42:53,385 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:42:53,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:53,391 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-02 00:42:53,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:53,405 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-02 00:42:53,513 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-02 00:42:53,514 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:53,520 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-02 00:42:53,521 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-02 00:42:53,521 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-02 00:42:53,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:53,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-02 00:42:53,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:53,678 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-02 00:42:53,881 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-02 00:42:53,882 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-02 00:42:53,882 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-02 00:42:53,882 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-02 00:42:53,882 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:53,896 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-02 00:42:53,897 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-02 00:42:53,898 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-02 00:42:53,899 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-02 00:42:54,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:54,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-02 00:42:54,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:54,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-02 00:42:54,304 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-02 00:42:54,304 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:54,312 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-02 00:42:54,312 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-02 00:42:54,312 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/index.html | 1 +
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-02 00:42:54,312 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-02 00:42:54,313 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-02 00:42:54,313 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-02 00:42:54,313 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-02 00:42:54,313 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-02 00:42:54,313 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-02 00:42:54,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:54,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-02 00:42:54,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:54,472 [ 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-02 00:42:54,520 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:54,523 [ scc.git] DEBUG setup.py | 2 +-
2024-08-02 00:42:54,523 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-02 00:42:54,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:54,862 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-02 00:42:54,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:54,880 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-02 00:42:54,918 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-02 00:42:54,918 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-02 00:42:54,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:54,924 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-02 00:42:54,924 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-02 00:42:54,924 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-02 00:42:54,924 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-02 00:42:54,924 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-02 00:42:55,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:55,285 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:42:55,328 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:42:55,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:55,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:42:55,380 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:42:55,390 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c9a3490> has no local changes
2024-08-02 00:42:55,390 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:42:55,401 [ scc.git] DEBUG [detached HEAD c5b54f1e] merge master -Dorg -Ssuccess-only
2024-08-02 00:42:55,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:42:55,402 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:42:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-02 00:42:56,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-02 00:42:56,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-02 00:42:57,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-02 00:42:57,623 [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-02 00:42:58,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-02 00:42:58,553 [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-02 00:42:58,555 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-02 00:42:58,556 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:42:58,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-02 00:42:58,556 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:42:58,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:58,566 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:42:58,575 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:42:58,576 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:42:58,585 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:42:58,593 [ scc.git] DEBUG Already up to date.
2024-08-02 00:42:58,593 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-02 00:42:58,953 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-02 00:42:58,953 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-02 00:42:58,959 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:42:58,959 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:42:58,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:58,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-02 00:42:58,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:58,979 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-02 00:42:59,022 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-02 00:42:59,023 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:42:59,027 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-02 00:42:59,027 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-02 00:42:59,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:42:59,175 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:42:59,223 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:42:59,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:42:59,231 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:42:59,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:42:59,284 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c9de7c0> has no local changes
2024-08-02 00:42:59,285 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:42:59,310 [ scc.git] DEBUG [detached HEAD d191593] merge master -Dorg -Ssuccess-only
2024-08-02 00:42:59,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:42:59,311 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:42:59,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-02 00:43:00,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-02 00:43:00,082 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:00,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-02 00:43:01,204 [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-02 00:43:01,733 [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-02 00:43:02,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-02 00:43:02,673 [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-02 00:43:02,674 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-02 00:43:02,674 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:02,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-02 00:43:02,675 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:02,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:02,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:02,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:02,687 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:02,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:02,698 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:02,699 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-02 00:43:02,996 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-02 00:43:02,997 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-02 00:43:03,003 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:03,003 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:03,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:03,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-02 00:43:03,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:03,022 [ 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-02 00:43:03,034 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:03,039 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-02 00:43:03,040 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-02 00:43:03,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:03,176 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:03,219 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:03,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:03,227 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:03,296 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:03,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c9dcaf0> has no local changes
2024-08-02 00:43:03,307 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:03,319 [ scc.git] DEBUG [detached HEAD e87d90c] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:03,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:03,319 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:03,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-02 00:43:04,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-02 00:43:04,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-02 00:43:04,634 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:05,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-02 00:43:05,728 [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-02 00:43:06,197 [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-02 00:43:06,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-02 00:43:07,159 [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-02 00:43:07,161 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-02 00:43:07,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-02 00:43:07,606 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:08,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-02 00:43:08,649 [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-02 00:43:09,165 [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-02 00:43:09,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-02 00:43:10,126 [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-02 00:43:10,127 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-02 00:43:10,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-02 00:43:11,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-02 00:43:11,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-02 00:43:12,003 [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-02 00:43:12,489 [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-02 00:43:12,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-02 00:43:13,370 [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-02 00:43:13,371 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-02 00:43:13,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-02 00:43:14,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-02 00:43:14,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-02 00:43:15,269 [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-02 00:43:15,739 [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-02 00:43:16,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-02 00:43:16,628 [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-02 00:43:16,629 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-02 00:43:17,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-02 00:43:17,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-02 00:43:17,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-02 00:43:18,453 [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-02 00:43:18,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-02 00:43:19,362 [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-02 00:43:19,363 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-02 00:43:19,364 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:19,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-02 00:43:19,364 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:19,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:19,371 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:19,378 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:19,378 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:19,421 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:19,430 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:19,430 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-02 00:43:19,989 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-02 00:43:19,989 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-02 00:43:19,993 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-02 00:43:20,973 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-02 00:43:20,973 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-02 00:43:20,980 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-02 00:43:21,343 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-02 00:43:21,344 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-02 00:43:21,350 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-02 00:43:21,681 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-02 00:43:21,681 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-02 00:43:21,686 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-02 00:43:21,987 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-02 00:43:21,987 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-02 00:43:21,993 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:21,993 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:21,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:22,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-02 00:43:22,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:22,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-02 00:43:22,057 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-02 00:43:22,057 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:22,061 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-02 00:43:22,061 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-02 00:43:22,061 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-02 00:43:22,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:22,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-02 00:43:22,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:22,212 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-02 00:43:22,343 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-02 00:43:22,343 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-02 00:43:22,343 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-02 00:43:22,343 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-02 00:43:22,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:22,349 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-02 00:43:22,349 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-02 00:43:22,349 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-02 00:43:22,349 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-02 00:43:22,349 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-02 00:43:22,349 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-02 00:43:22,349 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-02 00:43:22,349 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-02 00:43:22,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:22,574 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-02 00:43:22,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:22,590 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-02 00:43:22,655 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-02 00:43:22,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:22,659 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-02 00:43:22,659 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-02 00:43:22,659 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-02 00:43:22,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:22,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-02 00:43:22,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:22,981 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-02 00:43:22,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:23,007 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-02 00:43:23,007 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-02 00:43:23,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:23,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-02 00:43:23,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:23,368 [ 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-02 00:43:23,413 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-02 00:43:23,414 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:23,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:23,711 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:23,755 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:23,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:23,762 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:23,805 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:23,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c9dcd90> has no local changes
2024-08-02 00:43:23,813 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:23,824 [ scc.git] DEBUG [detached HEAD 647ff41] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:23,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:23,825 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:24,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-02 00:43:24,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-02 00:43:25,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-02 00:43:25,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-02 00:43:26,183 [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-02 00:43:26,682 [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-02 00:43:27,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-02 00:43:27,559 [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-02 00:43:27,559 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-02 00:43:27,560 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:27,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-02 00:43:27,560 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:27,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:27,570 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:27,577 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:27,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:27,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:27,595 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:27,595 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-02 00:43:27,959 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-02 00:43:27,959 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-02 00:43:27,963 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:27,963 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:27,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:27,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-02 00:43:27,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:27,983 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-02 00:43:27,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:27,997 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-02 00:43:27,997 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-02 00:43:27,997 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-02 00:43:27,997 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-02 00:43:27,997 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-02 00:43:27,997 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-02 00:43:28,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:28,143 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:28,190 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:28,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:28,198 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:28,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:28,255 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c153f70> has no local changes
2024-08-02 00:43:28,255 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:28,266 [ scc.git] DEBUG [detached HEAD 736bdb3] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:28,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:28,266 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:28,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-02 00:43:29,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-02 00:43:29,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-02 00:43:30,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-02 00:43:30,661 [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-02 00:43:31,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-02 00:43:31,548 [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-02 00:43:31,548 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-02 00:43:32,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-02 00:43:32,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-02 00:43:32,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-02 00:43:33,465 [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-02 00:43:33,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-02 00:43:34,357 [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-02 00:43:34,358 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-02 00:43:34,358 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:34,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-02 00:43:34,359 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:34,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:34,370 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:34,381 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:34,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:34,392 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:34,403 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:34,403 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-02 00:43:34,809 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-02 00:43:34,809 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-02 00:43:34,814 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-02 00:43:35,334 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-02 00:43:35,334 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-02 00:43:35,340 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:35,340 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:35,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:35,346 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-02 00:43:35,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:35,362 [ 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-02 00:43:35,476 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-02 00:43:35,477 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-02 00:43:35,477 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-02 00:43:35,477 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-02 00:43:35,477 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:43:35,477 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:43:35,483 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-02 00:43:35,489 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-02 00:43:35,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:35,630 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-02 00:43:35,642 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-02 00:43:35,651 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-02 00:43:35,659 [ scc.config] DEBUG Found github.token
2024-08-02 00:43:35,659 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-02 00:43:35,660 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-02 00:43:35,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:35,674 [ 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-02 00:43:35,699 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-02 00:43:35,700 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-02 00:43:35,700 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-02 00:43:35,700 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:43:35,700 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:43:35,707 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-02 00:43:35,717 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-02 00:43:36,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:36,018 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-02 00:43:36,030 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-02 00:43:36,038 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/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-02 00:43:36,045 [ scc.config] DEBUG Found github.token
2024-08-02 00:43:36,046 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-02 00:43:36,046 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:36,105 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:36,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:36,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:36,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:36,199 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c986d90> has no local changes
2024-08-02 00:43:36,200 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:36,215 [ scc.git] DEBUG [detached HEAD ca202f1] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:36,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:36,216 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:36,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-02 00:43:36,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-02 00:43:36,977 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:37,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-02 00:43:37,963 [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-02 00:43:38,455 [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-02 00:43:39,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-02 00:43:39,387 [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-02 00:43:39,388 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-02 00:43:39,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-02 00:43:39,838 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:40,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-02 00:43:41,166 [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-02 00:43:41,718 [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-02 00:43:42,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-02 00:43:42,637 [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-02 00:43:42,638 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-02 00:43:43,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-02 00:43:43,071 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-02 00:43:43,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-02 00:43:44,209 [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-02 00:43:44,658 [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-02 00:43:45,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-02 00:43:45,504 [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-02 00:43:45,505 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-02 00:43:45,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-02 00:43:46,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-02 00:43:46,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-02 00:43:47,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-02 00:43:47,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-02 00:43:48,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-02 00:43:48,229 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:48,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-02 00:43:48,229 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:48,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:48,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:48,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:48,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:48,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:48,252 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:48,252 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-02 00:43:48,585 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-02 00:43:48,585 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-02 00:43:48,590 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-02 00:43:48,869 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-02 00:43:48,869 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-02 00:43:48,875 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-02 00:43:49,159 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-02 00:43:49,159 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-02 00:43:49,165 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:49,166 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:49,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:49,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-02 00:43:49,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:49,191 [ 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-02 00:43:49,203 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:49,206 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-02 00:43:49,206 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-02 00:43:49,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:49,344 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-02 00:43:49,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:49,358 [ 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-02 00:43:49,404 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-02 00:43:49,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:49,409 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-02 00:43:49,409 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-02 00:43:49,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:49,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-02 00:43:49,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:49,748 [ 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-02 00:43:49,763 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-02 00:43:49,784 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:49,790 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-02 00:43:49,790 [ scc.git] DEBUG package.json | 2 +-
2024-08-02 00:43:49,790 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-02 00:43:50,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:50,150 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:50,206 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:50,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:50,215 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:50,270 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:50,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c1155b0> has no local changes
2024-08-02 00:43:50,282 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:50,295 [ scc.git] DEBUG [detached HEAD 45897cc] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:50,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:50,296 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:50,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-02 00:43:51,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-02 00:43:51,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-02 00:43:52,084 [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-02 00:43:52,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-02 00:43:52,945 [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-02 00:43:52,946 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-02 00:43:52,946 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:52,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-02 00:43:52,946 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:52,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:52,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:52,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:52,960 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:52,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:52,973 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:52,974 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-02 00:43:53,286 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-02 00:43:53,286 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-02 00:43:53,292 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:53,292 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:53,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:53,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-02 00:43:53,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:53,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-02 00:43:53,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:53,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:53,460 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:53,508 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:53,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:53,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:53,564 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:53,575 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c127eb0> has no local changes
2024-08-02 00:43:53,576 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:53,587 [ scc.git] DEBUG [detached HEAD caaa0e0] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:53,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:53,588 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:53,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-02 00:43:54,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-02 00:43:54,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-02 00:43:55,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-02 00:43:55,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-02 00:43:56,250 [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-02 00:43:56,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-02 00:43:57,124 [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-02 00:43:57,124 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-02 00:43:57,124 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:43:57,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-02 00:43:57,125 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:57,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:57,131 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:43:57,138 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:43:57,138 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:43:57,145 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:43:57,151 [ scc.git] DEBUG Already up to date.
2024-08-02 00:43:57,152 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-02 00:43:57,497 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-02 00:43:57,498 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-02 00:43:57,503 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:43:57,503 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:57,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:57,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-02 00:43:57,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:57,534 [ 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-02 00:43:57,573 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-02 00:43:57,574 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:43:57,579 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-02 00:43:57,580 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-02 00:43:57,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:43:57,716 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:43:57,758 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:43:57,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:43:57,766 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:43:57,807 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:43:57,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c125bb0> has no local changes
2024-08-02 00:43:57,816 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:43:57,827 [ scc.git] DEBUG [detached HEAD d29531a] merge master -Dorg -Ssuccess-only
2024-08-02 00:43:57,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:43:57,827 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:43:58,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-02 00:43:58,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-02 00:43:59,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-02 00:43:59,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-02 00:44:00,171 [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-02 00:44:00,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-02 00:44:01,084 [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-02 00:44:01,085 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-02 00:44:01,085 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:01,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-02 00:44:01,086 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:01,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:01,096 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:01,106 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:01,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:01,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:01,124 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:01,124 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-02 00:44:01,531 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-02 00:44:01,531 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-02 00:44:01,538 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:01,538 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:01,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:01,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-02 00:44:01,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:01,562 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-02 00:44:01,651 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-02 00:44:01,651 [ scc.git] DEBUG Auto-merging setup.py
2024-08-02 00:44:01,652 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-02 00:44:01,652 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:44:01,652 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:44:01,659 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-02 00:44:01,668 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-02 00:44:01,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:01,807 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-02 00:44:01,814 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-02 00:44:01,821 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2024-08-02 00:44:01,829 [ scc.config] DEBUG Found github.token
2024-08-02 00:44:01,830 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-02 00:44:01,830 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:01,882 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:01,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:01,889 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:01,937 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:01,947 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c1157f0> has no local changes
2024-08-02 00:44:01,947 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:01,960 [ scc.git] DEBUG [detached HEAD ef5cf45] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:01,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:01,961 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:02,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-02 00:44:02,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-02 00:44:03,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-02 00:44:03,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-02 00:44:04,233 [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-02 00:44:04,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-02 00:44:05,117 [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-02 00:44:05,118 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-02 00:44:05,118 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:05,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-02 00:44:05,118 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:05,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:05,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:05,133 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:05,133 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:05,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:05,149 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:05,150 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-02 00:44:05,521 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-02 00:44:05,521 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-02 00:44:05,525 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:05,526 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:05,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:05,532 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-02 00:44:05,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:05,546 [ 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-02 00:44:05,589 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-02 00:44:05,592 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-02 00:44:05,592 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-02 00:44:05,592 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-02 00:44:05,593 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-02 00:44:05,593 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-02 00:44:05,595 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-02 00:44:05,595 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-02 00:44:05,595 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-02 00:44:05,595 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-02 00:44:05,596 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-02 00:44:05,596 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-02 00:44:05,596 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-02 00:44:05,597 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-02 00:44:05,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:05,746 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:05,791 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:05,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:05,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:05,844 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:05,851 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c121ca0> has no local changes
2024-08-02 00:44:05,852 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:05,862 [ scc.git] DEBUG [detached HEAD d774ded] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:05,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:05,863 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:06,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-02 00:44:06,149 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:06,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-02 00:44:06,150 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,157 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:06,163 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:06,164 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:06,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:06,178 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:06,178 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:06,178 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,186 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:06,233 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,240 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:06,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:06,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c0802b0> has no local changes
2024-08-02 00:44:06,290 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:06,299 [ scc.git] DEBUG [detached HEAD 02672c2] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:06,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:06,299 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:06,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-02 00:44:06,549 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:06,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-02 00:44:06,550 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,558 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:06,566 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:06,566 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:06,574 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:06,581 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:06,581 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:06,581 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,586 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:06,638 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:06,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:06,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:06,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:06,704 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c0cbd60> has no local changes
2024-08-02 00:44:06,704 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:06,715 [ scc.git] DEBUG [detached HEAD 1078388] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:06,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:06,716 [ scc.git] INFO Overriding base-branch from master to main
2024-08-02 00:44:06,716 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:07,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-02 00:44:07,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-02 00:44:07,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-02 00:44:08,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-02 00:44:08,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-02 00:44:09,473 [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-02 00:44:09,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-02 00:44:10,318 [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-02 00:44:10,319 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-02 00:44:10,319 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:10,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-02 00:44:10,319 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:10,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:10,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-02 00:44:10,335 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:10,335 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-02 00:44:10,344 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-02 00:44:10,351 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:10,352 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-02 00:44:10,713 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-02 00:44:10,713 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-02 00:44:10,719 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:10,719 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:10,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:10,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-02 00:44:10,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:10,743 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-02 00:44:10,756 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-02 00:44:10,756 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-02 00:44:10,756 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:44:10,757 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:44:10,765 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-02 00:44:10,774 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-02 00:44:10,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:10,978 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-02 00:44:10,986 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-02 00:44:10,994 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-02 00:44:11,002 [ scc.config] DEBUG Found github.token
2024-08-02 00:44:11,002 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-02 00:44:11,002 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:11,048 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:11,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:11,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c0d6d30> has no local changes
2024-08-02 00:44:11,108 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:11,119 [ scc.git] DEBUG [detached HEAD 7d74e86] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:11,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:11,119 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:11,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-02 00:44:11,391 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:11,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-02 00:44:11,391 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,397 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:11,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:11,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:11,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:11,415 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:11,415 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:11,415 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,420 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:11,459 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,465 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:11,509 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:11,518 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c06a7c0> has no local changes
2024-08-02 00:44:11,518 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:11,529 [ scc.git] DEBUG [detached HEAD bb0056f] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:11,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:11,530 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:11,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-02 00:44:11,795 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:11,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-02 00:44:11,795 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,802 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:11,808 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:11,808 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:11,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:11,821 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:11,821 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:11,821 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:11,867 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:11,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:11,875 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:11,917 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:11,924 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c0a44f0> has no local changes
2024-08-02 00:44:11,924 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:11,933 [ scc.git] DEBUG [detached HEAD 4b46e74] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:11,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:11,934 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:12,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-02 00:44:12,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-02 00:44:13,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-02 00:44:13,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-02 00:44:14,198 [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-02 00:44:14,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-02 00:44:15,074 [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-02 00:44:15,075 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-02 00:44:15,075 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:15,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-02 00:44:15,075 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:15,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:15,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-02 00:44:15,098 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:15,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-02 00:44:15,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-02 00:44:15,111 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:15,111 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-02 00:44:15,486 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-02 00:44:15,486 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-02 00:44:15,493 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:15,493 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:15,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:15,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-02 00:44:15,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:15,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-02 00:44:15,587 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-02 00:44:15,587 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-02 00:44:15,588 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:44:15,588 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:44:15,596 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-02 00:44:15,603 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-02 00:44:15,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:15,803 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-02 00:44:15,820 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-02 00:44:15,830 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-02 00:44:15,837 [ scc.config] DEBUG Found github.token
2024-08-02 00:44:15,837 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-02 00:44:15,837 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:15,879 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:15,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:15,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:15,924 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:15,941 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c087df0> has no local changes
2024-08-02 00:44:15,941 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:15,953 [ scc.git] DEBUG [detached HEAD d5accc0] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:15,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:15,953 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-02 00:44:15,953 [ scc.repo] DEBUG ## PRs found:
2024-08-02 00:44:16,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-02 00:44:16,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-02 00:44:17,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-02 00:44:17,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-02 00:44:18,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-02 00:44:18,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-02 00:44:19,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-02 00:44:19,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-02 00:44:20,011 [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-02 00:44:20,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-02 00:44:20,813 [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-02 00:44:20,814 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-02 00:44:21,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-02 00:44:21,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-02 00:44:22,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-02 00:44:22,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-02 00:44:22,679 [ scc.repo] DEBUG ## Branches found:
2024-08-02 00:44:22,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-02 00:44:22,680 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:22,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:22,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-02 00:44:22,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-02 00:44:22,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-02 00:44:22,702 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-02 00:44:22,710 [ scc.git] DEBUG Already up to date.
2024-08-02 00:44:22,711 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-02 00:44:23,024 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-02 00:44:23,024 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-02 00:44:23,030 [ scc.git] DEBUG ## Unique users: []
2024-08-02 00:44:23,030 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:23,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:23,036 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-02 00:44:23,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:23,049 [ 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-02 00:44:23,061 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-02 00:44:23,061 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-02 00:44:23,061 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-02 00:44:23,061 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-02 00:44:23,068 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-02 00:44:23,074 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-02 00:44:23,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:23,206 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-02 00:44:23,215 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-02 00:44:23,224 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#140](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-02 00:44:23,231 [ scc.config] DEBUG Found github.token
2024-08-02 00:44:23,232 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-02 00:44:23,232 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-02 00:44:23,277 [ scc.git] DEBUG Get sha1 of %s
2024-08-02 00:44:23,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-02 00:44:23,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:23,324 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:23,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575c046970> has no local changes
2024-08-02 00:44:23,332 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:23,341 [ scc.git] DEBUG [detached HEAD aa7d23f] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:23,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:23,342 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-02 00:44:23,436 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-02 00:44:23,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:23,605 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-02 00:44:23,610 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-02 00:44:23,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:23,989 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-02 00:44:23,995 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-02 00:44:24,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:24,373 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-02 00:44:24,379 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-02 00:44:24,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:24,761 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-02 00:44:25,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:25,144 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-02 00:44:25,149 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-02 00:44:25,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:25,534 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-02 00:44:25,541 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-02 00:44:25,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:25,915 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-02 00:44:25,920 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-02 00:44:26,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:26,323 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-02 00:44:26,328 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-02 00:44:26,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:26,723 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-02 00:44:26,728 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-02 00:44:27,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:27,125 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-02 00:44:27,130 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-02 00:44:27,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:27,505 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-02 00:44:27,510 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-02 00:44:27,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:27,891 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-02 00:44:27,896 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-02 00:44:28,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:28,283 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-02 00:44:28,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:28,664 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-02 00:44:29,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:29,040 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-02 00:44:29,046 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-02 00:44:29,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:29,423 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-02 00:44:29,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:29,811 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-02 00:44:30,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:30,185 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-02 00:44:30,190 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-02 00:44:30,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:30,574 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-02 00:44:30,583 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-02 00:44:30,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:30,964 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-02 00:44:30,974 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-02 00:44:31,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:31,340 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-02 00:44:31,345 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-02 00:44:31,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-02 00:44:31,722 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-02 00:44:31,723 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-02 00:44:31,821 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f575da7b070> has local changes
2024-08-02 00:44:31,822 [ 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#140 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/140/)'
2024-08-02 00:44:31,837 [ scc.git] DEBUG [detached HEAD 77f6bce] merge master -Dorg -Ssuccess-only
2024-08-02 00:44:31,837 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-02 00:44:31,838 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-02 00:44:31,838 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-02 00:44:31,838 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-02 00:44:31,838 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-02 00:44:31,838 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-02 00:44:31,838 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-02 00:44:31,838 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,838 [ scc.merge] INFO
2024-08-02 00:44:31,838 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,838 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-02 00:44:31,839 [ scc.merge] INFO
2024-08-02 00:44:31,839 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-02 00:44:31,839 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-02 00:44:31,839 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,839 [ scc.merge] INFO
2024-08-02 00:44:31,839 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-02 00:44:31,839 [ scc.merge] INFO
2024-08-02 00:44:31,839 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-02 00:44:31,839 [ scc.merge] INFO
2024-08-02 00:44:31,839 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-02 00:44:31,839 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-02 00:44:31,839 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,839 [ scc.merge] INFO
2024-08-02 00:44:31,839 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-02 00:44:31,839 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-02 00:44:31,840 [ scc.merge] INFO
2024-08-02 00:44:31,840 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-02 00:44:31,840 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,840 [ scc.merge] INFO
2024-08-02 00:44:31,840 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-02 00:44:31,840 [ scc.merge] INFO
2024-08-02 00:44:31,840 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-02 00:44:31,840 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,840 [ scc.merge] INFO
2024-08-02 00:44:31,840 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-02 00:44:31,840 [ scc.merge] INFO
2024-08-02 00:44:31,840 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-02 00:44:31,840 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,840 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-02 00:44:31,841 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,841 [ scc.merge] INFO
2024-08-02 00:44:31,841 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-02 00:44:31,841 [ scc.merge] INFO
2024-08-02 00:44:31,841 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-02 00:44:31,841 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-02 00:44:31,841 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,841 [ scc.merge] INFO
2024-08-02 00:44:31,841 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,841 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-02 00:44:31,841 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-02 00:44:31,842 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-02 00:44:31,842 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-02 00:44:31,842 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-02 00:44:31,842 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-02 00:44:31,842 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-02 00:44:31,842 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-02 00:44:31,842 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,842 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,842 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-02 00:44:31,842 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Merged PRs:
2024-08-02 00:44:31,843 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-02 00:44:31,843 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,843 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,843 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-02 00:44:31,843 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,843 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-02 00:44:31,843 [ scc.merge] INFO
2024-08-02 00:44:31,843 [ scc.merge] INFO Repository: ome/scripts
2024-08-02 00:44:31,843 [ scc.merge] INFO Excluded PRs:
2024-08-02 00:44:31,843 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-02 00:44:31,844 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-02 00:44:31,844 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-02 00:44:31,844 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-02 00:44:31,844 [ scc.merge] INFO Already up to date.
2024-08-02 00:44:31,844 [ scc.merge] INFO
2024-08-02 00:44:31,844 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-02 00:44:31,844 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-02 00:44:31,844 [ scc.merge] INFO
2024-08-02 00:44:31,844 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-02 00:44:31,844 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-02 00:44:31,851 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-02 00:44:31,863 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-02 00:44:31,870 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-02 00:44:31,877 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-02 00:44:31,894 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-02 00:44:31,902 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-02 00:44:31,909 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-02 00:44:31,916 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-02 00:44:31,922 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-02 00:44:31,929 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-02 00:44:31,935 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-02 00:44:31,942 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-02 00:44:31,947 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-02 00:44:31,953 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-02 00:44:31,959 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-02 00:44:31,966 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-02 00:44:31,972 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-02 00:44:31,978 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-02 00:44:31,986 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:31,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:31,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-02 00:44:31,993 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:32,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:32,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-02 00:44:32,001 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:32,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-02 00:44:32,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-02 00:44:32,010 [ scc.git] DEBUG Calling 'git remote'
2024-08-02 00:44:32,017 [ 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 98e512a] 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 2550585] 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-02 00:45:17,232 [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-02 00:45:25,959 [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-02 00:45:28,265 [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-02 00:45:32,593 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-02 00:46:15,505 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/58f98332/images/svgs/logo.svg){kind=logo}
