Skipping 112 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-05-05 00:44:29,736 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-05 00:44:29,736 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-05 00:44:29,742 [ scc.git] DEBUG Calling 'git fetch origin pull/561/head'
2024-05-05 00:44:30,270 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-05 00:44:30,270 [ scc.git] DEBUG * branch refs/pull/561/head -> FETCH_HEAD
2024-05-05 00:44:30,275 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:44:30,275 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:30,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:30,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-05 00:44:30,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:30,291 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-05 00:44:30,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/views/right_panel_view.js | 69 +++++++++++++++++++++++++++-
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-05 00:44:30,487 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-05 00:44:30,487 [ scc.git] DEBUG 9 files changed, 265 insertions(+), 5 deletions(-)
2024-05-05 00:44:30,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:30,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-05 00:44:30,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:30,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-05 00:44:30,719 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:30,722 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-05 00:44:30,722 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-05 00:44:31,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:31,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-05 00:44:31,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:31,087 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-05 00:44:31,301 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-05 00:44:31,302 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-05 00:44:31,302 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-05 00:44:31,302 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:31,310 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-05 00:44:31,310 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-05 00:44:31,310 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-05 00:44:31,310 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-05 00:44:31,310 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-05 00:44:31,310 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-05 00:44:31,311 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-05 00:44:31,311 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-05 00:44:31,311 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-05 00:44:31,311 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-05 00:44:31,311 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-05 00:44:31,311 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-05 00:44:31,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:31,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-05 00:44:31,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:31,532 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-05 00:44:32,007 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-05 00:44:32,007 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-05 00:44:32,007 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-05 00:44:32,007 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-05 00:44:32,007 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:32,014 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-05 00:44:32,014 [ scc.git] DEBUG omero_figure/views.py | 69 +++++++++++++++++++++++
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/index.html | 1 +
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/models/figure_model.js | 29 +++++++++-
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-05 00:44:32,014 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-05 00:44:32,016 [ scc.git] DEBUG 13 files changed, 168 insertions(+), 10 deletions(-)
2024-05-05 00:44:32,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:32,179 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-05 00:44:32,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:32,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 561 (Bugfixes may2024) 629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-05 00:44:32,230 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:32,234 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 9 +++++----
2024-05-05 00:44:32,234 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 4 deletions(-)
2024-05-05 00:44:32,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:32,590 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:44:32,635 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:32,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:32,642 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:44:32,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:44:32,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986dfbe0> has no local changes
2024-05-05 00:44:32,695 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 561 will-moore 'Bugfixes may2024'
Generated by OMERO-plugins-push#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:44:32,708 [ scc.git] DEBUG [detached HEAD e0434ca0] merge master -Dorg -Ssuccess-only
2024-05-05 00:44:32,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:44:32,708 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:44:33,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-05 00:44:33,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-05 00:44:34,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-05 00:44:34,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-05 00:44:34,959 [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-05-05 00:44:35,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-05 00:44:35,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:35,909 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-05 00:44:35,910 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:44:35,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-05 00:44:35,910 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:35,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:35,916 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:44:35,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:44:35,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:44:35,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:44:35,936 [ scc.git] DEBUG Already up to date.
2024-05-05 00:44:35,937 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-05 00:44:36,370 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-05 00:44:36,371 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-05 00:44:36,376 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:44:36,376 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:36,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:36,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-05 00:44:36,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:36,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-05 00:44:36,440 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-05 00:44:36,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:36,445 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-05 00:44:36,445 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-05 00:44:36,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:36,602 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:44:36,646 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:36,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:36,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:44:36,694 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:44:36,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986ad550> has no local changes
2024-05-05 00:44:36,702 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:44:36,744 [ scc.git] DEBUG [detached HEAD 226c0b1] merge master -Dorg -Ssuccess-only
2024-05-05 00:44:36,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:44:36,744 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:44:37,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-05 00:44:37,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-05 00:44:37,567 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-05 00:44:38,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-05 00:44:38,543 [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-05-05 00:44:39,088 [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-05-05 00:44:39,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-05 00:44:39,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:39,969 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-05 00:44:39,969 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:44:39,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-05 00:44:39,970 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:39,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:39,982 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:44:39,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:44:39,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:44:40,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:44:40,010 [ scc.git] DEBUG Already up to date.
2024-05-05 00:44:40,011 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-05 00:44:40,398 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-05 00:44:40,398 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-05 00:44:40,404 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:44:40,405 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:40,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:40,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-05 00:44:40,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:40,428 [ 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-05-05 00:44:40,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:44:40,453 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-05 00:44:40,454 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-05 00:44:40,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:44:40,611 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:44:40,668 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:40,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:40,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:44:40,736 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:44:40,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986b5820> has no local changes
2024-05-05 00:44:40,746 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:44:40,771 [ scc.git] DEBUG [detached HEAD 18d6df2] merge master -Dorg -Ssuccess-only
2024-05-05 00:44:40,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:44:40,772 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:44:41,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-05 00:44:41,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-05-05 00:44:42,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-05-05 00:44:42,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-05 00:44:42,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-05 00:44:43,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-05 00:44:43,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-05 00:44:44,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/8a03e780c490251af547bc7f26a31af056816ad5?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:44,296 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-05-05 00:44:44,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-05 00:44:45,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-05 00:44:45,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-05 00:44:46,117 [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-05-05 00:44:46,573 [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-05-05 00:44:47,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-05 00:44:47,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:47,442 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-05 00:44:47,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-05-05 00:44:48,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-05-05 00:44:48,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-05 00:44:49,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-05 00:44:49,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-05 00:44:50,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-05 00:44:50,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:50,677 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-05-05 00:44:51,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-05 00:44:51,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-05 00:44:52,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-05 00:44:52,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-05 00:44:53,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-05 00:44:53,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:53,440 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-05 00:44:53,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-05 00:44:54,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-05 00:44:54,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-05 00:44:55,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-05 00:44:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-05 00:44:56,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-05 00:44:56,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:56,626 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-05 00:44:57,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-05 00:44:57,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-05 00:44:57,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-05 00:44:58,431 [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-05-05 00:44:58,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-05 00:44:59,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:44:59,349 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-05 00:44:59,350 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:44:59,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-05 00:44:59,350 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:44:59,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:44:59,356 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:44:59,361 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:44:59,361 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:44:59,366 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:44:59,372 [ scc.git] DEBUG Already up to date.
2024-05-05 00:44:59,372 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-05 00:44:59,875 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:44:59,875 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-05 00:44:59,881 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-05 00:45:01,379 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:45:01,379 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-05 00:45:01,386 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-05 00:45:01,863 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:45:01,863 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-05 00:45:01,869 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-05-05 00:45:03,093 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:45:03,094 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-05-05 00:45:03,099 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-05 00:45:03,606 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:45:03,606 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-05 00:45:03,611 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-05-05 00:45:04,338 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-05 00:45:04,338 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-05-05 00:45:04,344 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:04,344 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:04,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:04,352 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-05 00:45:04,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:04,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-05 00:45:04,386 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:04,399 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-05 00:45:04,399 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-05 00:45:04,399 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-05 00:45:04,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:04,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-05 00:45:04,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:04,569 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-05 00:45:04,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:04,741 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-05 00:45:04,741 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-05-05 00:45:04,741 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-05-05 00:45:04,742 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-05 00:45:04,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:04,972 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-05 00:45:04,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:04,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-05 00:45:05,073 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:05,076 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-05 00:45:05,076 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-05 00:45:05,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:05,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-05 00:45:05,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:05,396 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-05 00:45:05,512 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-05 00:45:05,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:05,519 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/events/events.js | 4 +
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-05-05 00:45:05,520 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-05-05 00:45:05,520 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-05-05 00:45:05,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:05,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-05 00:45:05,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:05,800 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-05 00:45:05,860 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-05 00:45:05,861 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:05,864 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-05 00:45:05,864 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-05 00:45:05,864 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-05 00:45:06,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:06,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-05 00:45:06,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:06,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) 8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-05 00:45:06,411 [ scc.git] DEBUG Auto-merging css/app.css
2024-05-05 00:45:06,411 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-05 00:45:06,411 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-05 00:45:06,411 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-05 00:45:06,411 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-05 00:45:06,412 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:06,417 [ scc.git] DEBUG css/app.css | 4 ++++
2024-05-05 00:45:06,417 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 18 +++++++++++-----
2024-05-05 00:45:06,417 [ scc.git] DEBUG src/app/context.js | 3 +++
2024-05-05 00:45:06,417 [ scc.git] DEBUG src/model/image_info.js | 50 +++++++++++++++++++++++++++++++++++++++++++
2024-05-05 00:45:06,417 [ scc.git] DEBUG src/utils/constants.js | 1 +
2024-05-05 00:45:06,417 [ scc.git] DEBUG 5 files changed, 71 insertions(+), 5 deletions(-)
2024-05-05 00:45:06,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:06,649 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:06,694 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:06,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:06,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:06,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:06,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986a15b0> has no local changes
2024-05-05 00:45:06,747 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:06,757 [ scc.git] DEBUG [detached HEAD ad080de] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:06,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:06,757 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:07,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-05 00:45:07,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-05 00:45:08,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-05 00:45:08,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-05 00:45:09,068 [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-05-05 00:45:09,522 [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-05-05 00:45:09,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-05 00:45:10,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:10,377 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-05 00:45:10,377 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:10,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-05 00:45:10,377 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:10,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:10,401 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:10,407 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:10,407 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:10,413 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:10,420 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:10,420 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-05 00:45:10,792 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-05 00:45:10,793 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-05 00:45:10,798 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:10,798 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:10,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:10,805 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-05 00:45:10,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:10,817 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-05 00:45:10,828 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:10,831 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-05 00:45:10,831 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-05 00:45:10,831 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-05 00:45:10,831 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-05 00:45:10,831 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-05 00:45:10,831 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-05 00:45:10,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:10,994 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:11,039 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:11,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:11,047 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:11,095 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:11,103 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986814f0> has no local changes
2024-05-05 00:45:11,103 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:11,113 [ scc.git] DEBUG [detached HEAD 7520dac] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:11,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:11,114 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:11,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-05 00:45:11,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-05 00:45:12,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-05 00:45:12,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-05 00:45:13,378 [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-05-05 00:45:13,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-05 00:45:14,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:14,255 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-05 00:45:14,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-05 00:45:15,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-05 00:45:15,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-05 00:45:16,088 [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-05-05 00:45:16,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-05 00:45:16,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:16,957 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-05 00:45:16,957 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:16,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-05 00:45:16,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:16,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:16,964 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:16,970 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:16,970 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:16,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:16,984 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:16,984 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-05 00:45:17,649 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-05 00:45:17,649 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-05 00:45:17,654 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-05 00:45:18,234 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-05 00:45:18,234 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-05 00:45:18,239 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:18,239 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:18,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:18,244 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-05 00:45:18,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:18,257 [ 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-05-05 00:45:18,337 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-05 00:45:18,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-05 00:45:18,337 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-05 00:45:18,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-05 00:45:18,337 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:45:18,338 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:45:18,345 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-05 00:45:18,353 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-05 00:45:18,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:18,526 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-05 00:45:18,533 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-05 00:45:18,539 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-05 00:45:18,545 [ scc.config] DEBUG Found github.token
2024-05-05 00:45:18,545 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-05 00:45:18,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-05 00:45:18,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:18,557 [ 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-05-05 00:45:18,624 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-05 00:45:18,624 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-05 00:45:18,624 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-05 00:45:18,624 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:45:18,625 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:45:18,633 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-05 00:45:18,641 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-05 00:45:18,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:18,933 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-05 00:45:18,941 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-05 00:45:18,946 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/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-05-05 00:45:18,951 [ scc.config] DEBUG Found github.token
2024-05-05 00:45:18,951 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-05 00:45:18,951 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:18,992 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:18,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:18,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:19,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:19,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986a1550> has no local changes
2024-05-05 00:45:19,045 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:19,053 [ scc.git] DEBUG [detached HEAD abf9ef9] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:19,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:19,053 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:19,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-05 00:45:20,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-05 00:45:20,030 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-05 00:45:20,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-05 00:45:20,942 [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-05-05 00:45:21,431 [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-05-05 00:45:21,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-05 00:45:22,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:22,364 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-05 00:45:22,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-05 00:45:22,839 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-05 00:45:23,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-05 00:45:23,737 [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-05-05 00:45:24,218 [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-05-05 00:45:24,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-05 00:45:25,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:25,175 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-05 00:45:25,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-05 00:45:25,630 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-05 00:45:26,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-05 00:45:26,552 [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-05-05 00:45:26,996 [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-05-05 00:45:27,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-05 00:45:27,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:27,884 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-05 00:45:28,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-05 00:45:28,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-05 00:45:29,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-05 00:45:29,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-05 00:45:30,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-05 00:45:30,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-05 00:45:30,676 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:30,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-05 00:45:30,676 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:30,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:30,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:30,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:30,689 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:30,695 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:30,702 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:30,702 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-05 00:45:31,116 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-05 00:45:31,116 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-05 00:45:31,121 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-05 00:45:31,494 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-05 00:45:31,494 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-05 00:45:31,500 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-05 00:45:31,893 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-05 00:45:31,894 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-05 00:45:31,898 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:31,898 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:31,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:31,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-05 00:45:31,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:31,918 [ 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-05-05 00:45:31,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:31,932 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-05 00:45:31,932 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-05 00:45:32,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:32,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-05 00:45:32,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:32,103 [ 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-05-05 00:45:32,155 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-05 00:45:32,156 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:32,159 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-05 00:45:32,159 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-05 00:45:32,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:32,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-05 00:45:32,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:32,510 [ 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-05-05 00:45:32,536 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-05 00:45:32,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:32,540 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-05 00:45:32,540 [ scc.git] DEBUG package.json | 2 +-
2024-05-05 00:45:32,540 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-05 00:45:32,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:32,901 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:32,945 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:32,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:32,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:32,996 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:33,005 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9867cfd0> has no local changes
2024-05-05 00:45:33,005 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:33,016 [ scc.git] DEBUG [detached HEAD d5595b3] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:33,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:33,016 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:33,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-05 00:45:33,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-05 00:45:34,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-05 00:45:34,800 [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-05-05 00:45:35,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-05 00:45:35,634 [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-05-05 00:45:35,635 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-05 00:45:35,635 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:35,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-05 00:45:35,636 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:35,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:35,643 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:35,648 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:35,648 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:35,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:35,658 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:35,658 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-05 00:45:36,039 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-05 00:45:36,039 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-05 00:45:36,044 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:36,044 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:36,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:36,051 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-05 00:45:36,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:36,062 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-05 00:45:36,072 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:36,245 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:36,290 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:36,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:36,296 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:36,335 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:36,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9861f340> has no local changes
2024-05-05 00:45:36,342 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:36,352 [ scc.git] DEBUG [detached HEAD 42bda47] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:36,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:36,353 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:36,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-05 00:45:37,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-05 00:45:37,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-05 00:45:38,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-05 00:45:38,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-05 00:45:39,021 [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-05-05 00:45:39,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-05 00:45:39,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:39,927 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-05 00:45:39,927 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:39,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-05 00:45:39,928 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:39,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:39,934 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:39,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:39,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:39,945 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:39,950 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:39,951 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-05 00:45:40,413 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-05 00:45:40,413 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-05 00:45:40,418 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:40,418 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:40,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:40,425 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-05 00:45:40,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:40,439 [ 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-05-05 00:45:40,450 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-05 00:45:40,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:40,453 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-05 00:45:40,453 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-05 00:45:40,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:40,612 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:40,654 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:40,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:40,661 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:40,717 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:40,724 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9864b5b0> has no local changes
2024-05-05 00:45:40,724 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:40,732 [ scc.git] DEBUG [detached HEAD 6fcba4d] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:40,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:40,733 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:41,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-05 00:45:41,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-05 00:45:42,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-05 00:45:42,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-05 00:45:43,041 [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-05-05 00:45:43,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-05 00:45:43,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:43,972 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-05 00:45:43,972 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:43,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-05 00:45:43,973 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:43,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:43,978 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:43,983 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:43,984 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:43,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:43,995 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:43,995 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-05 00:45:44,386 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-05 00:45:44,386 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-05 00:45:44,391 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:44,391 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:44,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:44,397 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-05 00:45:44,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:44,406 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-05 00:45:44,463 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-05 00:45:44,463 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-05 00:45:44,463 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-05 00:45:44,463 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-05 00:45:44,463 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-05 00:45:44,463 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-05 00:45:44,464 [ scc.git] DEBUG Auto-merging setup.py
2024-05-05 00:45:44,464 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-05 00:45:44,464 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:45:44,464 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:45:44,471 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-05 00:45:44,478 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-05 00:45:44,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:44,649 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-05 00:45:44,655 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-05 00:45:44,661 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-05-05 00:45:44,666 [ scc.config] DEBUG Found github.token
2024-05-05 00:45:44,666 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-05 00:45:44,667 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:44,709 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:44,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:44,716 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:44,760 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:44,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf986b5df0> has no local changes
2024-05-05 00:45:44,769 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:44,779 [ scc.git] DEBUG [detached HEAD 4a15ce8] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:44,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:44,780 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:45,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-05 00:45:45,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-05 00:45:46,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-05 00:45:46,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-05 00:45:46,910 [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-05-05 00:45:47,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-05 00:45:47,787 [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-05-05 00:45:47,788 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-05 00:45:47,788 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:47,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-05 00:45:47,788 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:47,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:47,795 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:47,802 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:47,802 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:47,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:47,822 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:47,822 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-05 00:45:48,278 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-05 00:45:48,279 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-05 00:45:48,716 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:48,717 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:48,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:48,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-05 00:45:48,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:48,754 [ 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-05-05 00:45:48,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-05 00:45:48,878 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-05 00:45:48,880 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-05 00:45:48,881 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-05 00:45:48,881 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-05 00:45:48,882 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-05 00:45:48,883 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-05 00:45:48,883 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-05 00:45:48,883 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-05 00:45:48,883 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-05 00:45:49,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:49,028 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:49,093 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:49,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:49,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:49,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:49,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9867cdf0> has no local changes
2024-05-05 00:45:49,164 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:49,195 [ scc.git] DEBUG [detached HEAD db4c4c6] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:49,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:49,196 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:49,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-05 00:45:49,472 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:49,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-05 00:45:49,473 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:49,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:49,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:49,500 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:49,500 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:49,521 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:49,538 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:49,539 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:49,539 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:49,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:49,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:49,664 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:49,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:49,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:49,781 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:49,792 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9863cfa0> has no local changes
2024-05-05 00:45:49,793 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:49,811 [ scc.git] DEBUG [detached HEAD 99cf85b] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:49,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:49,812 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:50,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-05 00:45:50,005 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:50,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-05 00:45:50,006 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:50,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:50,020 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:50,032 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:50,032 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:50,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:50,055 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:50,055 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:50,055 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:50,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:50,065 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:50,120 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:50,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:50,129 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:50,184 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:50,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf98626f70> has no local changes
2024-05-05 00:45:50,200 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:50,215 [ scc.git] DEBUG [detached HEAD 5430225] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:50,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:50,216 [ scc.git] INFO Overriding base-branch from master to main
2024-05-05 00:45:50,216 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:50,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-05 00:45:50,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-05 00:45:51,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-05 00:45:51,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-05 00:45:52,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-05 00:45:52,788 [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-05-05 00:45:53,248 [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-05-05 00:45:53,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-05 00:45:54,149 [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-05-05 00:45:54,150 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-05 00:45:54,150 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:54,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-05 00:45:54,151 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:54,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:54,167 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-05 00:45:54,173 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:54,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-05 00:45:54,180 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-05 00:45:54,187 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:54,187 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-05 00:45:54,615 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-05 00:45:54,615 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-05 00:45:54,626 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:54,627 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:54,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:54,638 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-05 00:45:54,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:54,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-05 00:45:54,676 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-05 00:45:54,677 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-05 00:45:54,677 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:45:54,677 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:45:54,684 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-05 00:45:54,692 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-05 00:45:54,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:54,849 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-05 00:45:54,859 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-05 00:45:54,866 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-05 00:45:54,872 [ scc.config] DEBUG Found github.token
2024-05-05 00:45:54,873 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-05 00:45:54,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:54,934 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:54,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:54,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:54,980 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:54,987 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf985f8430> has no local changes
2024-05-05 00:45:54,988 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:54,998 [ scc.git] DEBUG [detached HEAD 8c13525] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:54,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:54,998 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:55,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-05 00:45:55,286 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:55,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-05 00:45:55,286 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,292 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:55,298 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:55,298 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:55,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:55,312 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:55,313 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:55,313 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,320 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:55,367 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,375 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:55,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:55,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9862de50> has no local changes
2024-05-05 00:45:55,432 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:55,442 [ scc.git] DEBUG [detached HEAD b95ebef] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:55,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:55,442 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:55,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-05 00:45:55,718 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:55,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-05 00:45:55,719 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:55,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:55,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:55,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:55,741 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:55,741 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:55,742 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:55,787 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:55,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:55,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:55,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:55,847 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9853f940> has no local changes
2024-05-05 00:45:55,847 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:55,860 [ scc.git] DEBUG [detached HEAD f5a96f0] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:55,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:55,860 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:45:56,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-05 00:45:56,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-05 00:45:57,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-05 00:45:57,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-05 00:45:58,049 [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-05-05 00:45:58,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-05 00:45:58,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:45:58,923 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-05 00:45:58,923 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:45:58,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-05 00:45:58,923 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:58,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:58,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:45:58,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:45:58,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:45:58,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:45:58,945 [ scc.git] DEBUG Already up to date.
2024-05-05 00:45:58,945 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-05 00:45:59,368 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-05 00:45:59,368 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-05 00:45:59,388 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:45:59,389 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:59,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:59,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-05 00:45:59,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:59,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-05 00:45:59,503 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-05 00:45:59,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-05 00:45:59,503 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:45:59,504 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:45:59,511 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-05 00:45:59,519 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-05 00:45:59,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:45:59,673 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-05 00:45:59,679 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-05 00:45:59,684 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-05 00:45:59,688 [ scc.config] DEBUG Found github.token
2024-05-05 00:45:59,688 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-05 00:45:59,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:45:59,728 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:45:59,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:45:59,734 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:45:59,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:45:59,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9859f310> has no local changes
2024-05-05 00:45:59,779 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:45:59,788 [ scc.git] DEBUG [detached HEAD 0764363] merge master -Dorg -Ssuccess-only
2024-05-05 00:45:59,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:45:59,789 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-05 00:45:59,789 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:46:00,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-05 00:46:00,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-05 00:46:01,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-05 00:46:01,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-05 00:46:02,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-05 00:46:02,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-05 00:46:02,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-05 00:46:03,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-05 00:46:03,817 [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-05-05 00:46:04,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-05 00:46:04,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:46:04,706 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-05 00:46:05,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-05 00:46:05,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-05 00:46:06,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-05 00:46:06,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-05 00:46:06,660 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:46:06,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-05 00:46:06,660 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:46:06,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:46:06,667 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-05 00:46:06,674 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:46:06,674 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-05 00:46:06,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-05 00:46:06,688 [ scc.git] DEBUG Already up to date.
2024-05-05 00:46:06,688 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-05 00:46:07,215 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-05 00:46:07,215 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-05 00:46:07,220 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:46:07,220 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:46:07,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:46:07,225 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-05 00:46:07,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:46:07,237 [ 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-05-05 00:46:07,288 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-05 00:46:07,288 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-05 00:46:07,289 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-05 00:46:07,290 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-05 00:46:07,296 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-05 00:46:07,301 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-05 00:46:07,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:07,447 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-05 00:46:07,455 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-05 00:46:07,461 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#56](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-05 00:46:07,466 [ scc.config] DEBUG Found github.token
2024-05-05 00:46:07,466 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-05 00:46:07,466 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:46:07,505 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:46:07,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:46:07,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:46:07,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:46:07,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9853fbb0> has no local changes
2024-05-05 00:46:07,559 [ 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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:46:07,570 [ scc.git] DEBUG [detached HEAD 23deefa] merge master -Dorg -Ssuccess-only
2024-05-05 00:46:07,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:07,571 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:46:07,654 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-05 00:46:07,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:07,885 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-05 00:46:07,890 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-05 00:46:08,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:08,279 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-05 00:46:08,284 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-05 00:46:08,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:08,690 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-05 00:46:08,695 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-05 00:46:09,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:09,107 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-05 00:46:09,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:09,520 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-05 00:46:09,525 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-05 00:46:09,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:09,935 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-05 00:46:09,939 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-05 00:46:10,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:10,346 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-05 00:46:10,352 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-05 00:46:10,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:10,786 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-05 00:46:10,792 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-05 00:46:11,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:11,291 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-05 00:46:11,303 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-05 00:46:11,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:11,628 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-05 00:46:11,635 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-05 00:46:12,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:12,035 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-05 00:46:12,042 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-05 00:46:12,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:12,452 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-05 00:46:12,456 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-05 00:46:12,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:12,864 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-05 00:46:13,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:13,281 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-05 00:46:13,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:13,680 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-05 00:46:13,684 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-05 00:46:14,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:14,096 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-05 00:46:14,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:14,504 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-05 00:46:14,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:14,910 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-05 00:46:14,915 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-05 00:46:15,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:15,331 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-05 00:46:15,337 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-05 00:46:15,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:15,745 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-05 00:46:15,751 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-05 00:46:16,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:16,157 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-05 00:46:16,163 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-05 00:46:16,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:46:16,572 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-05 00:46:16,573 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:46:16,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9b35e460> has local changes
2024-05-05 00:46:16,674 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
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'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 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 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 561 will-moore 'Bugfixes may2024'
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 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
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#56 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/56/)'
2024-05-05 00:46:16,689 [ scc.git] DEBUG [detached HEAD af370bd] merge master -Dorg -Ssuccess-only
2024-05-05 00:46:16,689 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-05 00:46:16,690 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-05 00:46:16,690 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,690 [ scc.merge] INFO
2024-05-05 00:46:16,690 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,691 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-05-05 00:46:16,691 [ scc.merge] INFO - PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
2024-05-05 00:46:16,691 [ scc.merge] INFO
2024-05-05 00:46:16,691 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-05 00:46:16,691 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,691 [ scc.merge] INFO
2024-05-05 00:46:16,691 [ scc.merge] INFO
2024-05-05 00:46:16,691 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-05 00:46:16,691 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,691 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-05 00:46:16,691 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,691 [ scc.merge] INFO
2024-05-05 00:46:16,691 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,691 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-05 00:46:16,691 [ scc.merge] INFO
2024-05-05 00:46:16,692 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-05 00:46:16,692 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-05 00:46:16,692 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,692 [ scc.merge] INFO
2024-05-05 00:46:16,692 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-05 00:46:16,692 [ scc.merge] INFO
2024-05-05 00:46:16,692 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-05 00:46:16,692 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-05 00:46:16,692 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-05 00:46:16,692 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,692 [ scc.merge] INFO
2024-05-05 00:46:16,693 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-05 00:46:16,693 [ scc.merge] INFO
2024-05-05 00:46:16,693 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-05 00:46:16,693 [ scc.merge] INFO
2024-05-05 00:46:16,693 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-05 00:46:16,693 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-05 00:46:16,693 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,693 [ scc.merge] INFO
2024-05-05 00:46:16,693 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-05 00:46:16,693 [ scc.merge] INFO - PR 561 will-moore 'Bugfixes may2024'
2024-05-05 00:46:16,693 [ scc.merge] INFO
2024-05-05 00:46:16,693 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-05 00:46:16,693 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-05 00:46:16,694 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-05 00:46:16,694 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-05 00:46:16,694 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-05-05 00:46:16,694 [ scc.merge] INFO
2024-05-05 00:46:16,694 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-05 00:46:16,694 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,694 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-05 00:46:16,694 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,695 [ scc.merge] INFO
2024-05-05 00:46:16,695 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-05 00:46:16,695 [ scc.merge] INFO
2024-05-05 00:46:16,695 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-05 00:46:16,695 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,695 [ scc.merge] INFO
2024-05-05 00:46:16,695 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-05 00:46:16,695 [ scc.merge] INFO
2024-05-05 00:46:16,695 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-05 00:46:16,695 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-05 00:46:16,695 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-05 00:46:16,696 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-05 00:46:16,696 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-05 00:46:16,696 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-05 00:46:16,696 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-05 00:46:16,696 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,696 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-05 00:46:16,696 [ scc.merge] INFO
2024-05-05 00:46:16,696 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-05 00:46:16,697 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Merged PRs:
2024-05-05 00:46:16,697 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-05 00:46:16,697 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-05 00:46:16,697 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-05 00:46:16,697 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,697 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-05 00:46:16,697 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,697 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-05 00:46:16,697 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO
2024-05-05 00:46:16,697 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-05 00:46:16,698 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-05 00:46:16,698 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] INFO Repository: ome/scripts
2024-05-05 00:46:16,698 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-05 00:46:16,698 [ scc.merge] INFO Already up to date.
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-05 00:46:16,698 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-05 00:46:16,698 [ scc.merge] INFO
2024-05-05 00:46:16,698 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-05 00:46:16,698 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-05 00:46:16,704 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-05 00:46:16,710 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-05 00:46:16,716 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-05 00:46:16,722 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-05 00:46:16,727 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-05 00:46:16,732 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-05 00:46:16,736 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-05 00:46:16,741 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-05 00:46:16,746 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-05 00:46:16,751 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-05 00:46:16,756 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-05 00:46:16,762 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-05 00:46:16,766 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-05 00:46:16,771 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-05 00:46:16,776 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-05 00:46:16,783 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-05 00:46:16,790 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-05 00:46:16,796 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-05 00:46:16,803 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-05 00:46:16,809 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-05 00:46:16,816 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-05 00:46:16,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-05 00:46:16,822 [ scc.git] DEBUG Calling 'git remote'
2024-05-05 00:46:16,827 [ 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.8.2 to 5.9.1-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 89be287] 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 2ca566b
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 6bdf72cb
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 9d8d147
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 a0148a6
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 5a90893
nothing to commit, working tree clean
[detached HEAD 48a5e3d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-05-05 00:47:02,600 [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-05-05 00:47:11,614 [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-05-05 00:47:13,981 [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-05-05 00:47:18,540 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-05 00:48:04,528 [ 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/b864b239/images/svgs/logo.svg){kind=logo}
