Skipping 110 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-24 00:42:49,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:42:49,498 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:42:49,505 [ scc.git] DEBUG Already up to date.
2024-07-24 00:42:49,505 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-24 00:42:49,990 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 00:42:49,990 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-24 00:42:49,995 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-24 00:42:50,625 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 00:42:50,625 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-24 00:42:50,630 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-24 00:42:51,635 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 00:42:51,635 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-24 00:42:51,641 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-24 00:42:52,028 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 00:42:52,029 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-24 00:42:52,034 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-24 00:42:52,660 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 00:42:52,660 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-24 00:42:52,666 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:42:52,666 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:42:52,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:52,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-24 00:42:52,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:52,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-24 00:42:52,783 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-24 00:42:52,784 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-24 00:42:52,790 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-24 00:42:52,790 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-24 00:42:52,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:52,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-24 00:42:52,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:52,979 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-24 00:42:53,283 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 00:42:53,283 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-24 00:42:53,283 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-24 00:42:53,284 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-24 00:42:53,284 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:53,290 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-24 00:42:53,290 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-24 00:42:53,291 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-24 00:42:53,291 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-24 00:42:53,291 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-24 00:42:53,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:53,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-24 00:42:53,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:53,475 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-24 00:42:53,799 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-24 00:42:53,800 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:53,807 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-24 00:42:53,807 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-24 00:42:53,808 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/index.html | 1 +
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-24 00:42:53,808 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-24 00:42:53,808 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-24 00:42:53,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:53,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-24 00:42:53,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:53,997 [ 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-07-24 00:42:54,062 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:54,065 [ scc.git] DEBUG setup.py | 2 +-
2024-07-24 00:42:54,065 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-24 00:42:54,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:54,396 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-24 00:42:54,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:54,410 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-24 00:42:54,496 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 00:42:54,496 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-24 00:42:54,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:54,501 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-24 00:42:54,501 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-24 00:42:54,501 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-24 00:42:54,501 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-24 00:42:54,501 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-24 00:42:54,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:54,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:42:54,835 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:42:54,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:54,840 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:42:54,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:42:54,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb3307490> has no local changes
2024-07-24 00:42:54,886 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:42:54,896 [ scc.git] DEBUG [detached HEAD 629536a1] merge master -Dorg -Ssuccess-only
2024-07-24 00:42:54,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:42:54,897 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:42:55,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-24 00:42:55,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-24 00:42:56,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-24 00:42:56,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-24 00:42:57,215 [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-07-24 00:42:57,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-24 00:42:58,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:42:58,172 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-24 00:42:58,172 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:42:58,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-24 00:42:58,173 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:42:58,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:58,179 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:42:58,186 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:42:58,186 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:42:58,192 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:42:58,198 [ scc.git] DEBUG Already up to date.
2024-07-24 00:42:58,199 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-24 00:42:58,642 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-24 00:42:58,643 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-24 00:42:58,648 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:42:58,649 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:42:58,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:58,654 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-24 00:42:58,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:58,666 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-24 00:42:58,707 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-24 00:42:58,708 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:42:58,711 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-24 00:42:58,711 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-24 00:42:58,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:42:58,866 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:42:58,922 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:42:58,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:42:58,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:42:58,976 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:42:58,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb3320a60> has no local changes
2024-07-24 00:42:58,985 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:42:58,998 [ scc.git] DEBUG [detached HEAD c1afcc5] merge master -Dorg -Ssuccess-only
2024-07-24 00:42:58,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:42:58,998 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:42:59,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-24 00:42:59,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-24 00:42:59,830 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:00,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-24 00:43:00,901 [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-07-24 00:43:01,432 [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-07-24 00:43:01,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-24 00:43:02,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:02,398 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-24 00:43:02,398 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:02,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-24 00:43:02,399 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:02,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:02,405 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:02,410 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:02,410 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:02,415 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:02,419 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:02,420 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-24 00:43:02,775 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-24 00:43:02,775 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-24 00:43:02,779 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:02,779 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:02,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:02,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-24 00:43:02,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:02,794 [ 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-07-24 00:43:02,804 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:02,808 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-24 00:43:02,808 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-24 00:43:02,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:02,970 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:03,018 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:03,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:03,024 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:03,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:03,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb331baf0> has no local changes
2024-07-24 00:43:03,073 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:03,082 [ scc.git] DEBUG [detached HEAD 6b5b61c] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:03,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:03,083 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:03,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-24 00:43:04,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-24 00:43:04,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-24 00:43:04,523 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:05,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-24 00:43:05,611 [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-07-24 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-07-24 00:43:06,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-24 00:43:07,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:07,069 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-24 00:43:07,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-24 00:43:07,552 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:08,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-24 00:43:08,650 [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-07-24 00:43:09,201 [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-07-24 00:43:09,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-24 00:43:10,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:10,199 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-24 00:43:10,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-24 00:43:11,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-24 00:43:11,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-24 00:43:12,162 [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-07-24 00:43:12,617 [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-07-24 00:43:13,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-24 00:43:13,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:13,561 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-24 00:43:14,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-24 00:43:14,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-24 00:43:15,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-24 00:43:15,639 [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-07-24 00:43:16,136 [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-07-24 00:43:16,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-24 00:43:17,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:17,103 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-24 00:43:17,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-24 00:43:18,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-24 00:43:18,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-24 00:43:19,019 [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-07-24 00:43:19,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-24 00:43:19,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:19,993 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-24 00:43:19,993 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:19,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-24 00:43:19,994 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:19,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:20,000 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:20,005 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:20,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:20,048 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:20,055 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:20,055 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-24 00:43:20,764 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 00:43:20,764 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-24 00:43:20,770 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-24 00:43:21,682 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 00:43:21,682 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-24 00:43:21,687 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-24 00:43:22,095 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 00:43:22,095 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-24 00:43:22,100 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-24 00:43:22,447 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 00:43:22,447 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-24 00:43:22,453 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-24 00:43:22,805 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 00:43:22,805 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-24 00:43:22,810 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:22,811 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:22,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:22,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-24 00:43:22,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:22,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-24 00:43:23,083 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-24 00:43:23,084 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:23,088 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-24 00:43:23,088 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-24 00:43:23,088 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-24 00:43:23,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:23,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-24 00:43:23,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:23,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-24 00:43:23,390 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-24 00:43:23,391 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-24 00:43:23,391 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-24 00:43:23,391 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-24 00:43:23,391 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:23,395 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-24 00:43:23,395 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-24 00:43:23,395 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-24 00:43:23,396 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-24 00:43:23,396 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-24 00:43:23,396 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-24 00:43:23,396 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-24 00:43:23,396 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-24 00:43:23,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:23,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-24 00:43:23,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:23,694 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-24 00:43:23,760 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-24 00:43:23,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:23,764 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-24 00:43:23,764 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-24 00:43:23,764 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-24 00:43:24,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:24,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-24 00:43:24,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:24,120 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-24 00:43:24,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:24,165 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-24 00:43:24,166 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-24 00:43:24,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:24,501 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-24 00:43:24,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:24,522 [ 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-07-24 00:43:24,575 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 00:43:24,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:24,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:24,916 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:24,956 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:24,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:24,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:25,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:25,013 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb32d8880> has no local changes
2024-07-24 00:43:25,013 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:25,022 [ scc.git] DEBUG [detached HEAD ad0b260] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:25,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:25,023 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:25,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-24 00:43:25,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-24 00:43:26,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-24 00:43:26,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-24 00:43:27,476 [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-07-24 00:43:27,939 [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-07-24 00:43:28,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-24 00:43:28,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:28,788 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-24 00:43:28,788 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:28,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-24 00:43:28,788 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:28,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:28,795 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:28,801 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:28,801 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:28,807 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:28,814 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:28,814 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-24 00:43:29,170 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-24 00:43:29,171 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-24 00:43:29,176 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:29,176 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:29,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:29,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-24 00:43:29,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:29,195 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-24 00:43:29,206 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:29,209 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-24 00:43:29,209 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-24 00:43:29,209 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-24 00:43:29,209 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-24 00:43:29,209 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-24 00:43:29,209 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-24 00:43:29,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:29,385 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:29,428 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:29,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:29,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:29,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:29,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb32ffdf0> has no local changes
2024-07-24 00:43:29,481 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:29,489 [ scc.git] DEBUG [detached HEAD b1de36b] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:29,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:29,489 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:29,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-24 00:43:30,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-24 00:43:31,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-24 00:43:31,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-24 00:43:32,001 [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-07-24 00:43:32,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-24 00:43:32,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:32,868 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-24 00:43:33,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-24 00:43:33,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-24 00:43:34,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-24 00:43:34,732 [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-07-24 00:43:35,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-24 00:43:35,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:35,656 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-24 00:43:35,656 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:35,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-24 00:43:35,656 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:35,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:35,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:35,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:35,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:35,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:35,679 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:35,679 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-24 00:43:36,254 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-24 00:43:36,254 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-24 00:43:36,260 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-24 00:43:36,709 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-24 00:43:36,709 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-24 00:43:36,714 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:36,714 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:36,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:36,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-24 00:43:36,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:36,733 [ 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-07-24 00:43:36,810 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-24 00:43:36,810 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-24 00:43:36,810 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-24 00:43:36,810 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-24 00:43:36,810 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:43:36,811 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:43:36,816 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 00:43:36,824 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-24 00:43:37,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:37,004 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-24 00:43:37,012 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 00:43:37,017 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-24 00:43:37,021 [ scc.config] DEBUG Found github.token
2024-07-24 00:43:37,022 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-24 00:43:37,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-24 00:43:37,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:37,036 [ 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-07-24 00:43:37,056 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-24 00:43:37,057 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-24 00:43:37,057 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-24 00:43:37,057 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:43:37,057 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:43:37,063 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 00:43:37,069 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-24 00:43:37,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:37,418 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-24 00:43:37,426 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 00:43:37,432 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/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-07-24 00:43:37,436 [ scc.config] DEBUG Found github.token
2024-07-24 00:43:37,437 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-24 00:43:37,437 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:37,478 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:37,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:37,483 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:37,522 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:37,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb02b0f10> has no local changes
2024-07-24 00:43:37,530 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:37,539 [ scc.git] DEBUG [detached HEAD b449383] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:37,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:37,539 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:38,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-24 00:43:38,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-24 00:43:38,502 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:39,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-24 00:43:39,615 [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-07-24 00:43:40,092 [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-07-24 00:43:40,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-24 00:43:40,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:40,976 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-24 00:43:41,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-24 00:43:41,471 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:42,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-24 00:43:42,545 [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-07-24 00:43:43,010 [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-07-24 00:43:43,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-24 00:43:43,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:43,973 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-24 00:43:44,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-24 00:43:44,465 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 00:43:45,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-24 00:43:45,511 [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-07-24 00:43:46,020 [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-07-24 00:43:46,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-24 00:43:46,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:46,986 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-24 00:43:47,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-24 00:43:47,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-24 00:43:48,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-24 00:43:48,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-24 00:43:49,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-24 00:43:49,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-24 00:43:49,931 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:49,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-24 00:43:49,932 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:49,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:49,937 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:49,942 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:49,942 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:49,947 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:49,952 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:49,952 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-24 00:43:50,337 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 00:43:50,337 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-24 00:43:50,343 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-24 00:43:50,768 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 00:43:50,768 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-24 00:43:50,773 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-24 00:43:51,113 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 00:43:51,113 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-24 00:43:51,118 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:51,118 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:51,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:51,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-24 00:43:51,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:51,135 [ 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-07-24 00:43:51,145 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:51,148 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-24 00:43:51,148 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-24 00:43:51,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:51,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-24 00:43:51,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:51,323 [ 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-07-24 00:43:51,400 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 00:43:51,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:51,405 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-24 00:43:51,405 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-24 00:43:51,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:51,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-24 00:43:51,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:51,730 [ 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-07-24 00:43:51,755 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 00:43:51,756 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:51,759 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-24 00:43:51,759 [ scc.git] DEBUG package.json | 2 +-
2024-07-24 00:43:51,759 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-24 00:43:52,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:52,124 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:52,163 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:52,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:52,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:52,210 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:52,220 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb024f4f0> has no local changes
2024-07-24 00:43:52,221 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:52,231 [ scc.git] DEBUG [detached HEAD f12ff2d] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:52,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:52,232 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:52,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-24 00:43:53,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-24 00:43:53,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-24 00:43:54,143 [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-07-24 00:43:54,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-24 00:43:55,068 [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-07-24 00:43:55,069 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-24 00:43:55,069 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:55,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-24 00:43:55,069 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:55,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:55,076 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:55,081 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:55,081 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:55,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:55,092 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:55,092 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-24 00:43:55,448 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-24 00:43:55,448 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-24 00:43:55,454 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:43:55,454 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:55,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:55,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-24 00:43:55,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:55,472 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-24 00:43:55,483 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:43:55,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:43:55,637 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:43:55,677 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:55,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:55,683 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:43:55,722 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:43:55,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb02b8760> has no local changes
2024-07-24 00:43:55,730 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:43:55,743 [ scc.git] DEBUG [detached HEAD a1c1993] merge master -Dorg -Ssuccess-only
2024-07-24 00:43:55,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:43:55,743 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:43:56,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-24 00:43:56,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-24 00:43:57,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-24 00:43:57,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-24 00:43:58,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-24 00:43:58,594 [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-07-24 00:43:59,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-24 00:43:59,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:43:59,509 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-24 00:43:59,509 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:43:59,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-24 00:43:59,509 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:43:59,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:43:59,516 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:43:59,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:43:59,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:43:59,531 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:43:59,538 [ scc.git] DEBUG Already up to date.
2024-07-24 00:43:59,538 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-24 00:44:00,041 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-24 00:44:00,042 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-24 00:44:00,046 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:00,046 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:00,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:00,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-24 00:44:00,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:00,068 [ 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-07-24 00:44:00,079 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-24 00:44:00,080 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:44:00,082 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-24 00:44:00,082 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-24 00:44:00,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:00,248 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:00,287 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:00,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:00,293 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:00,331 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:00,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb0285bb0> has no local changes
2024-07-24 00:44:00,339 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:00,348 [ scc.git] DEBUG [detached HEAD b33bf79] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:00,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:00,348 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:00,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-24 00:44:01,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-24 00:44:01,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-24 00:44:02,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-24 00:44:02,790 [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-07-24 00:44:03,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-24 00:44:03,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:44:03,831 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-24 00:44:03,831 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:03,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-24 00:44:03,831 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:03,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:03,837 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:03,842 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:03,842 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:03,847 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:03,853 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:03,853 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-24 00:44:04,289 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-24 00:44:04,290 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-24 00:44:04,295 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:04,295 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:04,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:04,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 00:44:04,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:04,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 00:44:04,401 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-24 00:44:04,401 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-24 00:44:04,401 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-24 00:44:04,401 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-24 00:44:04,401 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-24 00:44:04,401 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-24 00:44:04,402 [ scc.git] DEBUG Auto-merging setup.py
2024-07-24 00:44:04,402 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-24 00:44:04,402 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:44:04,402 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:44:04,408 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-24 00:44:04,413 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-24 00:44:04,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:04,568 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 00:44:04,574 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-24 00:44:04,582 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-07-24 00:44:04,588 [ scc.config] DEBUG Found github.token
2024-07-24 00:44:04,588 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-24 00:44:04,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:04,625 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:04,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:04,631 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:04,667 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:04,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb0274700> has no local changes
2024-07-24 00:44:04,674 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:04,681 [ scc.git] DEBUG [detached HEAD f0a00a4] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:04,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:04,681 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:05,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-24 00:44:05,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-24 00:44:05,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-24 00:44:06,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-24 00:44:07,009 [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-07-24 00:44:07,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-24 00:44:08,044 [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-07-24 00:44:08,045 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-24 00:44:08,045 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:08,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-24 00:44:08,046 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:08,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:08,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:08,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:08,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:08,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:08,075 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:08,075 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-24 00:44:08,588 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-24 00:44:08,589 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-24 00:44:08,594 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:08,594 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:08,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:08,601 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-24 00:44:08,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:08,617 [ 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-07-24 00:44:08,646 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-24 00:44:08,649 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-24 00:44:08,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-24 00:44:08,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-24 00:44:08,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-24 00:44:08,652 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-24 00:44:08,653 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-24 00:44:08,653 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-24 00:44:08,653 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-24 00:44:08,653 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-24 00:44:08,654 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-24 00:44:08,654 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-24 00:44:08,654 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-24 00:44:08,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:08,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:08,849 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:08,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:08,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:08,906 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:08,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb023f610> has no local changes
2024-07-24 00:44:08,914 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:08,927 [ scc.git] DEBUG [detached HEAD 2fce435] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:08,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:08,928 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:09,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-24 00:44:09,237 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:09,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-24 00:44:09,237 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,245 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:09,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:09,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:09,258 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:09,265 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:09,265 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:09,265 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,272 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:09,312 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,318 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:09,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:09,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb01dafd0> has no local changes
2024-07-24 00:44:09,367 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:09,378 [ scc.git] DEBUG [detached HEAD 95c651d] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:09,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:09,378 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:09,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-24 00:44:09,652 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:09,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-24 00:44:09,652 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,658 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:09,664 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:09,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:09,670 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:09,677 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:09,677 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:09,677 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:09,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:09,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:09,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:09,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:09,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb0244d00> has no local changes
2024-07-24 00:44:09,795 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:10,358 [ scc.git] DEBUG [detached HEAD 0f3585f] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:10,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:10,358 [ scc.git] INFO Overriding base-branch from master to main
2024-07-24 00:44:10,358 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:10,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-24 00:44:11,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-24 00:44:11,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-24 00:44:12,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-24 00:44:12,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-24 00:44:13,073 [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-07-24 00:44:13,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 00:44:14,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-24 00:44:14,584 [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-07-24 00:44:14,585 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-24 00:44:14,585 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:14,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-24 00:44:14,585 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:14,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:14,593 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-24 00:44:14,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:14,600 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-24 00:44:14,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-24 00:44:14,614 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:14,614 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-24 00:44:15,073 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-24 00:44:15,073 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-24 00:44:15,078 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:15,078 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:15,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 00:44:15,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,097 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 00:44:15,248 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-24 00:44:15,249 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-24 00:44:15,249 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:44:15,249 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:44:15,256 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-24 00:44:15,263 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-24 00:44:15,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:15,430 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 00:44:15,436 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-24 00:44:15,440 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-24 00:44:15,445 [ scc.config] DEBUG Found github.token
2024-07-24 00:44:15,445 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-24 00:44:15,445 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:15,482 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:15,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:15,525 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:15,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb0246f10> has no local changes
2024-07-24 00:44:15,531 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:15,538 [ scc.git] DEBUG [detached HEAD ebea957] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:15,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:15,539 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:15,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-24 00:44:15,866 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:15,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-24 00:44:15,866 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:15,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:15,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:15,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:15,883 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:15,889 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:15,889 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:15,889 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:15,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,894 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:15,933 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:15,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:15,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:15,975 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:15,981 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb01dd700> has no local changes
2024-07-24 00:44:15,981 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:15,989 [ scc.git] DEBUG [detached HEAD 6d13690] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:15,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:15,990 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:16,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-24 00:44:16,303 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:16,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-24 00:44:16,303 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:16,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:16,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:16,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:16,313 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:16,318 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:16,323 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:16,323 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:16,324 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:16,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:16,328 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:16,365 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:16,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:16,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:16,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:16,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb02034f0> has no local changes
2024-07-24 00:44:16,426 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:16,434 [ scc.git] DEBUG [detached HEAD 7072d53] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:16,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:16,435 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:16,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-24 00:44:17,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-24 00:44:17,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-24 00:44:18,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-24 00:44:18,646 [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-07-24 00:44:19,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-24 00:44:19,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:44:19,673 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-24 00:44:19,673 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:19,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-24 00:44:19,673 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:19,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:19,679 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 00:44:19,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:19,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 00:44:19,691 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 00:44:19,698 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:19,698 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-24 00:44:20,114 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-24 00:44:20,114 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-24 00:44:20,118 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:20,118 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:20,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:20,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 00:44:20,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:20,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 00:44:20,165 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-24 00:44:20,166 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-24 00:44:20,166 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:44:20,166 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:44:20,173 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-24 00:44:20,182 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-24 00:44:20,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:20,355 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 00:44:20,362 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-24 00:44:20,367 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-24 00:44:20,372 [ scc.config] DEBUG Found github.token
2024-07-24 00:44:20,372 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-24 00:44:20,372 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:20,412 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:20,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:20,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:20,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:20,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb01a58b0> has no local changes
2024-07-24 00:44:20,465 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:20,473 [ scc.git] DEBUG [detached HEAD 468787c] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:20,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:20,474 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-24 00:44:20,474 [ scc.repo] DEBUG ## PRs found:
2024-07-24 00:44:20,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-24 00:44:21,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-24 00:44:22,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-24 00:44:22,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-24 00:44:23,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-24 00:44:23,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-24 00:44:23,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-24 00:44:24,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 00:44:24,881 [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-07-24 00:44:25,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 00:44:25,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-24 00:44:25,746 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 00:44:26,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-24 00:44:26,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-24 00:44:27,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-24 00:44:27,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-24 00:44:27,780 [ scc.repo] DEBUG ## Branches found:
2024-07-24 00:44:27,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-24 00:44:27,780 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:27,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:27,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-24 00:44:27,791 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 00:44:27,792 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-24 00:44:27,798 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-24 00:44:27,805 [ scc.git] DEBUG Already up to date.
2024-07-24 00:44:27,806 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-24 00:44:28,230 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-24 00:44:28,231 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-24 00:44:28,236 [ scc.git] DEBUG ## Unique users: []
2024-07-24 00:44:28,236 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:28,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:28,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 00:44:28,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:28,257 [ 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-07-24 00:44:28,293 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 00:44:28,294 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 00:44:28,294 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 00:44:28,294 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 00:44:28,301 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 00:44:28,309 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 00:44:28,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:28,502 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 00:44:28,510 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 00:44:28,516 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#132](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-24 00:44:28,521 [ scc.config] DEBUG Found github.token
2024-07-24 00:44:28,521 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-24 00:44:28,521 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 00:44:28,563 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 00:44:28,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 00:44:28,570 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:28,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:28,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb01a5580> has no local changes
2024-07-24 00:44:28,617 [ 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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:28,626 [ scc.git] DEBUG [detached HEAD 0f52bef] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:28,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:28,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 00:44:28,707 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-24 00:44:28,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:28,927 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-24 00:44:28,931 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-24 00:44:29,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:29,357 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-24 00:44:29,363 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-24 00:44:29,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:29,779 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-24 00:44:29,784 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-24 00:44:30,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:30,212 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-24 00:44:30,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:30,637 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-24 00:44:30,643 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-24 00:44:31,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:31,063 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-24 00:44:31,068 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-24 00:44:31,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:31,469 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-24 00:44:31,475 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-24 00:44:31,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:31,901 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-24 00:44:31,909 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-24 00:44:32,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:32,304 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-24 00:44:32,310 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-24 00:44:32,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:32,797 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-24 00:44:32,804 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-24 00:44:33,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:33,207 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-24 00:44:33,215 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-24 00:44:33,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:33,628 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-24 00:44:33,636 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-24 00:44:34,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:34,044 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-24 00:44:34,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:34,459 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-24 00:44:34,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:34,864 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-24 00:44:34,871 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-24 00:44:35,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:35,293 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-24 00:44:35,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:35,716 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-24 00:44:36,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:36,117 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-24 00:44:36,124 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-24 00:44:36,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:36,539 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-24 00:44:36,545 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-24 00:44:36,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:36,975 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-24 00:44:36,983 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-24 00:44:37,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:37,393 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-24 00:44:37,398 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-24 00:44:37,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 00:44:37,825 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-24 00:44:37,825 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 00:44:37,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efdb681e460> has local changes
2024-07-24 00:44:37,910 [ 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.
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])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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#132 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/132/)'
2024-07-24 00:44:37,926 [ scc.git] DEBUG [detached HEAD 841e5fa] merge master -Dorg -Ssuccess-only
2024-07-24 00:44:37,926 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-24 00:44:37,926 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-24 00:44:37,926 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,926 [ scc.merge] INFO
2024-07-24 00:44:37,926 [ scc.merge] INFO
2024-07-24 00:44:37,926 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-24 00:44:37,926 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,926 [ scc.merge] INFO
2024-07-24 00:44:37,926 [ scc.merge] INFO
2024-07-24 00:44:37,926 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-24 00:44:37,927 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-24 00:44:37,927 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-24 00:44:37,927 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-24 00:44:37,927 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-24 00:44:37,927 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-24 00:44:37,927 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-24 00:44:37,927 [ scc.merge] INFO
2024-07-24 00:44:37,927 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-24 00:44:37,927 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-24 00:44:37,927 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-24 00:44:37,928 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-24 00:44:37,928 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-24 00:44:37,928 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-24 00:44:37,928 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-24 00:44:37,928 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-24 00:44:37,928 [ scc.merge] INFO
2024-07-24 00:44:37,928 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-24 00:44:37,928 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,928 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-24 00:44:37,928 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-24 00:44:37,929 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-24 00:44:37,929 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-24 00:44:37,929 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-24 00:44:37,929 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-24 00:44:37,929 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-24 00:44:37,929 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,929 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,929 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-24 00:44:37,929 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,929 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,930 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Merged PRs:
2024-07-24 00:44:37,930 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-24 00:44:37,930 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,930 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,930 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-24 00:44:37,930 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,930 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-24 00:44:37,930 [ scc.merge] INFO
2024-07-24 00:44:37,930 [ scc.merge] INFO Repository: ome/scripts
2024-07-24 00:44:37,931 [ scc.merge] INFO Excluded PRs:
2024-07-24 00:44:37,931 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-24 00:44:37,931 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-24 00:44:37,931 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-24 00:44:37,931 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-24 00:44:37,931 [ scc.merge] INFO Already up to date.
2024-07-24 00:44:37,931 [ scc.merge] INFO
2024-07-24 00:44:37,931 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 00:44:37,931 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 00:44:37,931 [ scc.merge] INFO
2024-07-24 00:44:37,931 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 00:44:37,931 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-24 00:44:37,937 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-24 00:44:37,943 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-24 00:44:37,948 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-24 00:44:37,954 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-24 00:44:37,959 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-24 00:44:37,965 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-24 00:44:37,971 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-24 00:44:37,976 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-24 00:44:37,982 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-24 00:44:37,988 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-24 00:44:37,993 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:37,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:37,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-24 00:44:37,999 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-24 00:44:38,004 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-24 00:44:38,009 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-24 00:44:38,015 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-24 00:44:38,021 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-24 00:44:38,027 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-24 00:44:38,032 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-24 00:44:38,038 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-24 00:44:38,044 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-24 00:44:38,049 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 00:44:38,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-24 00:44:38,054 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 00:44:38,060 [ 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.1 to 5.9.2-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 259e958] 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 c20d273
nothing to commit, working tree clean
[detached HEAD d391d4c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-24 00:45:26,392 [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-07-24 00:45:35,474 [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-07-24 00:45:37,916 [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-07-24 00:45:42,600 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-24 00:46:31,846 [ 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/b04263cd/images/svgs/logo.svg){kind=logo}
