Skipping 97 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- 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'
Generated by OMERO-plugins-push#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:41:43,494 [ scc.git] DEBUG [detached HEAD c58d5cb] merge master -Dorg -Ssuccess-only
2024-05-15 00:41:43,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:41:43,495 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:41:43,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-15 00:41:44,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-15 00:41:44,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-15 00:41:45,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-15 00:41:45,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-15 00:41:46,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-15 00:41:46,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-15 00:41:47,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b73d06c8b742151f9eccded34a4b65df343586cd?per_page=1 HTTP/1.1" 200 2
2024-05-15 00:41:47,096 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-15 00:41:47,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-15 00:41:47,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-15 00:41:48,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-15 00:41:48,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-15 00:41:49,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-15 00:41:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-15 00:41:50,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-05-15 00:41:50,285 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-15 00:41:50,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/554 HTTP/1.1" 200 None
2024-05-15 00:41:51,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5 HTTP/1.1" 200 None
2024-05-15 00:41:51,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-15 00:41:52,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-15 00:41:52,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5 HTTP/1.1" 200 None
2024-05-15 00:41:53,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/902c4461b9479c4681e6bf71114616299e2adde5?per_page=1 HTTP/1.1" 200 2
2024-05-15 00:41:53,036 [ scc.repo] DEBUG - PR 554 jburel 'Update publish'
2024-05-15 00:41:53,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-15 00:41:54,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-15 00:41:54,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-15 00:41:55,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-15 00:41:55,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-15 00:41:55,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-05-15 00:41:55,870 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-15 00:41:56,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-15 00:41:56,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-15 00:41:56,771 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:41:56,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-15 00:41:56,771 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:41:56,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:41:56,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:41:56,783 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:41:56,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:41:56,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:41:56,795 [ scc.git] DEBUG Already up to date.
2024-05-15 00:41:56,795 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-15 00:41:57,605 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-15 00:41:57,605 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-15 00:41:57,610 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-05-15 00:41:58,186 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-15 00:41:58,186 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-05-15 00:41:58,191 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-15 00:41:58,793 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-15 00:41:58,793 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-15 00:41:58,798 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-15 00:41:59,608 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-15 00:41:59,608 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-15 00:41:59,613 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:41:59,613 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:41:59,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:41:59,618 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-15 00:41:59,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:41:59,631 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-15 00:41:59,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-15 00:41:59,738 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-15 00:41:59,740 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-15 00:41:59,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:41:59,903 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-15 00:41:59,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:41:59,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-15 00:41:59,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:41:59,964 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-15 00:41:59,965 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-15 00:42:00,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:00,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-15 00:42:00,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:00,342 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-15 00:42:00,498 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-15 00:42:00,499 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-15 00:42:00,499 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-15 00:42:00,499 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:00,506 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-15 00:42:00,506 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-15 00:42:00,506 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-15 00:42:00,506 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-15 00:42:00,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:00,743 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-15 00:42:00,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:00,755 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-15 00:42:00,839 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-15 00:42:00,839 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-15 00:42:00,839 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-15 00:42:00,839 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-15 00:42:00,839 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-15 00:42:00,840 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:00,847 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++-
2024-05-15 00:42:00,847 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-15 00:42:00,847 [ scc.git] DEBUG omero_figure/views.py | 69 ++++++++++++++++++++++
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/index.html | 1 +
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++-
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-15 00:42:00,847 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-15 00:42:00,848 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-15 00:42:00,848 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-15 00:42:00,848 [ scc.git] DEBUG 14 files changed, 189 insertions(+), 13 deletions(-)
2024-05-15 00:42:01,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:01,155 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:01,197 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:01,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:01,203 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:01,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:01,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58c11be0> has no local changes
2024-05-15 00:42:01,252 [ 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'
Generated by OMERO-plugins-push#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:01,263 [ scc.git] DEBUG [detached HEAD 0948b7a1] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:01,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:01,264 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:01,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-15 00:42:02,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-15 00:42:02,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-15 00:42:03,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-15 00:42:03,467 [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-15 00:42:03,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-15 00:42:04,310 [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-15 00:42:04,311 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-15 00:42:04,311 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:04,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-15 00:42:04,311 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:04,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:04,318 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:04,324 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:04,324 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:04,330 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:04,336 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:04,336 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-15 00:42:04,746 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-15 00:42:04,746 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-15 00:42:04,751 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:04,752 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:04,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:04,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-15 00:42:04,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:04,770 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-15 00:42:04,786 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-15 00:42:04,787 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:04,790 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-15 00:42:04,790 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-15 00:42:04,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:04,942 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:04,983 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:04,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:04,989 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:05,030 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:05,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bde550> has no local changes
2024-05-15 00:42:05,039 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:05,050 [ scc.git] DEBUG [detached HEAD 04d02f3] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:05,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:05,051 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:05,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-15 00:42:05,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-15 00:42:05,923 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-15 00:42:06,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-15 00:42:06,922 [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-15 00:42:07,409 [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-15 00:42:07,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-15 00:42:08,268 [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-15 00:42:08,269 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-15 00:42:08,269 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:08,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-15 00:42:08,270 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:08,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:08,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:08,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:08,284 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:08,291 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:08,298 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:08,298 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-15 00:42:08,696 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-15 00:42:08,697 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-15 00:42:08,702 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:08,702 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:08,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:08,709 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-15 00:42:08,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:08,720 [ 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-15 00:42:08,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:08,740 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-15 00:42:08,740 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-15 00:42:08,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:08,902 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:08,941 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:08,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:08,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:08,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:08,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58be19d0> has no local changes
2024-05-15 00:42:08,998 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:09,010 [ scc.git] DEBUG [detached HEAD 480bb96] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:09,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:09,010 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:09,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-15 00:42:09,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-15 00:42:10,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-15 00:42:10,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-15 00:42:11,331 [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-15 00:42:11,789 [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-15 00:42:12,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-15 00:42:12,637 [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-15 00:42:12,642 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-15 00:42:13,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-15 00:42:13,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-15 00:42:14,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-15 00:42:14,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-15 00:42:14,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-15 00:42:15,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-15 00:42:15,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/0eaee155506e5851ccebed9a01799cf86ebb9f63?per_page=1 HTTP/1.1" 200 2
2024-05-15 00:42:15,843 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-15 00:42:16,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-15 00:42:16,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-15 00:42:17,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-15 00:42:17,739 [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-15 00:42:18,189 [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-15 00:42:18,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-15 00:42:19,069 [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-15 00:42:19,070 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-15 00:42:19,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-15 00:42:19,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-15 00:42:20,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-15 00:42:20,901 [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-15 00:42:21,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-15 00:42:21,743 [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-15 00:42:21,743 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-15 00:42:21,744 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:21,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-15 00:42:21,744 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:21,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:21,750 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:21,755 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:21,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:21,763 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:21,770 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:21,770 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-15 00:42:22,202 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-15 00:42:22,202 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-15 00:42:22,207 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-15 00:42:23,066 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-15 00:42:23,066 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-15 00:42:23,071 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-15 00:42:23,494 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-15 00:42:23,495 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-15 00:42:23,499 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-15 00:42:23,944 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-15 00:42:23,945 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-15 00:42:23,950 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:23,950 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:23,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:23,956 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-15 00:42:23,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:23,968 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-15 00:42:23,997 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-15 00:42:23,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:24,002 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-15 00:42:24,002 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-15 00:42:24,002 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-15 00:42:24,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:24,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-15 00:42:24,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:24,176 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-15 00:42:24,246 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-15 00:42:24,247 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-15 00:42:24,247 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-15 00:42:24,247 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-15 00:42:24,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:24,251 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-15 00:42:24,251 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-15 00:42:24,251 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-15 00:42:24,251 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-15 00:42:24,251 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-15 00:42:24,251 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-15 00:42:24,251 [ scc.git] DEBUG 6 files changed, 294 insertions(+), 6 deletions(-)
2024-05-15 00:42:24,251 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-15 00:42:24,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:24,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-15 00:42:24,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:24,588 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-15 00:42:24,606 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:24,608 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-15 00:42:24,609 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-15 00:42:24,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:24,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-15 00:42:24,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:24,992 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-15 00:42:25,020 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-15 00:42:25,020 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:25,023 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-15 00:42:25,023 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-15 00:42:25,024 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-15 00:42:25,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:25,386 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:25,428 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:25,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:25,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:25,484 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:25,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bc05b0> has no local changes
2024-05-15 00:42:25,492 [ 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 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:25,502 [ scc.git] DEBUG [detached HEAD ff63f99] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:25,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:25,503 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:25,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-15 00:42:26,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-15 00:42:26,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-15 00:42:27,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-15 00:42:27,804 [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-15 00:42:28,251 [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-15 00:42:28,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-15 00:42:29,104 [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-15 00:42:29,105 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-15 00:42:29,105 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:29,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-15 00:42:29,105 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:29,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:29,111 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:29,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:29,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:29,123 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:29,128 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:29,129 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-15 00:42:29,517 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-15 00:42:29,518 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-15 00:42:29,522 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:29,522 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:29,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:29,527 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-15 00:42:29,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:29,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-15 00:42:29,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:29,551 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-15 00:42:29,551 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-15 00:42:29,551 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-15 00:42:29,551 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-15 00:42:29,551 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-15 00:42:29,551 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-15 00:42:29,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:29,701 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:29,743 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:29,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:29,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:29,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:29,796 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bae4f0> has no local changes
2024-05-15 00:42:29,797 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:29,805 [ scc.git] DEBUG [detached HEAD 4123cf9] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:29,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:29,805 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:30,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-15 00:42:30,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-15 00:42:31,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-15 00:42:31,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-15 00:42:32,195 [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-15 00:42:32,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-15 00:42:33,040 [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-15 00:42:33,040 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-15 00:42:33,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-15 00:42:33,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-15 00:42:34,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-15 00:42:34,873 [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-15 00:42:35,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-15 00:42:35,718 [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-15 00:42:35,719 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-15 00:42:35,719 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:35,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-15 00:42:35,720 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:35,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:35,725 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:35,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:35,731 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:35,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:35,741 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:35,742 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-15 00:42:36,412 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-15 00:42:36,412 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-15 00:42:36,418 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-15 00:42:36,935 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-15 00:42:36,935 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-15 00:42:36,940 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:36,940 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:36,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:36,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-15 00:42:36,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:36,960 [ 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-15 00:42:37,021 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-15 00:42:37,021 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-15 00:42:37,021 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-15 00:42:37,021 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-15 00:42:37,021 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:42:37,022 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:42:37,028 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-15 00:42:37,035 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-15 00:42:37,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:37,190 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-15 00:42:37,197 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-15 00:42:37,203 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-15 00:42:37,208 [ scc.config] DEBUG Found github.token
2024-05-15 00:42:37,208 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-15 00:42:37,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-15 00:42:37,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:37,220 [ 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-15 00:42:37,238 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-15 00:42:37,239 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-15 00:42:37,239 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-15 00:42:37,239 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:42:37,239 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:42:37,245 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-15 00:42:37,253 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-15 00:42:37,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:37,596 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-15 00:42:37,604 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-15 00:42:37,610 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/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-15 00:42:37,615 [ scc.config] DEBUG Found github.token
2024-05-15 00:42:37,615 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-15 00:42:37,616 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:37,656 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:37,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:37,662 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:37,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:37,712 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bc0550> has no local changes
2024-05-15 00:42:37,712 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:37,722 [ scc.git] DEBUG [detached HEAD ae558ce] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:37,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:37,723 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:38,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-15 00:42:38,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-15 00:42:38,657 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-15 00:42:39,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-15 00:42:39,680 [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-15 00:42:40,228 [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-15 00:42:40,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-15 00:42:41,190 [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-15 00:42:41,191 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-15 00:42:41,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-15 00:42:41,642 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-15 00:42:42,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-15 00:42:42,573 [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-15 00:42:43,067 [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-15 00:42:43,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-15 00:42:44,026 [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-15 00:42:44,027 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-15 00:42:44,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-15 00:42:44,531 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-15 00:42:45,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-15 00:42:45,571 [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-15 00:42:46,042 [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-15 00:42:46,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-15 00:42:46,900 [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-15 00:42:46,901 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-15 00:42:47,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-15 00:42:47,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-15 00:42:48,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-15 00:42:48,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-15 00:42:49,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-15 00:42:49,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-15 00:42:49,750 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:49,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-15 00:42:49,750 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:49,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:49,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:49,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:49,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:49,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:49,773 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:49,773 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-15 00:42:50,195 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-15 00:42:50,196 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-15 00:42:50,201 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-15 00:42:50,582 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-15 00:42:50,582 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-15 00:42:50,587 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-15 00:42:50,961 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-15 00:42:50,961 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-15 00:42:50,967 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:50,968 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:50,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:50,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-15 00:42:50,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:50,985 [ 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-15 00:42:50,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:51,001 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-15 00:42:51,001 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-15 00:42:51,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:51,151 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-15 00:42:51,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:51,165 [ 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-15 00:42:51,189 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-15 00:42:51,189 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:51,193 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-15 00:42:51,193 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-15 00:42:51,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:51,568 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-15 00:42:51,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:51,580 [ 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-15 00:42:51,594 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-15 00:42:51,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:51,598 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-15 00:42:51,598 [ scc.git] DEBUG package.json | 2 +-
2024-05-15 00:42:51,598 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-15 00:42:51,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:51,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:52,020 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:52,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:52,025 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:52,065 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:52,073 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bb8fd0> has no local changes
2024-05-15 00:42:52,074 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:52,084 [ scc.git] DEBUG [detached HEAD 974aa4b] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:52,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:52,085 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:52,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-15 00:42:52,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-15 00:42:53,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-15 00:42:53,864 [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-15 00:42:54,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-15 00:42:54,722 [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-15 00:42:54,723 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-15 00:42:54,724 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:54,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-15 00:42:54,724 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:54,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:54,731 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:54,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:54,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:54,741 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:54,746 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:54,747 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-15 00:42:55,137 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-15 00:42:55,137 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-15 00:42:55,142 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:55,142 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:55,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:55,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-15 00:42:55,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:55,158 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-15 00:42:55,166 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:55,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:55,331 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:55,375 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:55,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:55,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:55,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:55,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe5834f340> has no local changes
2024-05-15 00:42:55,431 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:55,440 [ scc.git] DEBUG [detached HEAD 6d0fc69] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:55,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:55,441 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:42:55,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-15 00:42:56,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-15 00:42:56,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-15 00:42:57,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-15 00:42:57,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-15 00:42:58,197 [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-15 00:42:58,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-15 00:42:59,111 [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-15 00:42:59,112 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-15 00:42:59,112 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:42:59,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-15 00:42:59,112 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:59,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:59,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:42:59,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:42:59,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:42:59,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:42:59,139 [ scc.git] DEBUG Already up to date.
2024-05-15 00:42:59,140 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-15 00:42:59,621 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-15 00:42:59,622 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-15 00:42:59,628 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:42:59,628 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:59,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:59,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-15 00:42:59,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:59,651 [ 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-15 00:42:59,663 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-15 00:42:59,664 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:42:59,667 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-15 00:42:59,667 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-15 00:42:59,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:42:59,846 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:42:59,901 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:42:59,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:42:59,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:42:59,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:42:59,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe5838e5b0> has no local changes
2024-05-15 00:42:59,958 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:42:59,967 [ scc.git] DEBUG [detached HEAD 989aed0] merge master -Dorg -Ssuccess-only
2024-05-15 00:42:59,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:42:59,968 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:00,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-15 00:43:00,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-15 00:43:01,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-15 00:43:01,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-15 00:43:02,169 [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-15 00:43:02,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-15 00:43:03,091 [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-15 00:43:03,092 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-15 00:43:03,092 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:03,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-15 00:43:03,092 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:03,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:03,098 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:03,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:03,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:03,110 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:03,116 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:03,116 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-15 00:43:03,537 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-15 00:43:03,538 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-15 00:43:03,542 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:03,542 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:03,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:03,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-15 00:43:03,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:03,560 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-15 00:43:03,605 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG Auto-merging setup.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-15 00:43:03,605 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:43:03,606 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:43:03,612 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-15 00:43:03,620 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-15 00:43:03,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:03,782 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-15 00:43:03,788 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-15 00:43:03,793 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2024-05-15 00:43:03,798 [ scc.config] DEBUG Found github.token
2024-05-15 00:43:03,798 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-15 00:43:03,798 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:03,838 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:03,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:03,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:03,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:03,890 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58be1e80> has no local changes
2024-05-15 00:43:03,891 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:03,899 [ scc.git] DEBUG [detached HEAD 3132e30] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:03,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:03,900 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:04,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-15 00:43:04,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-15 00:43:05,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-15 00:43:05,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-15 00:43:06,105 [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-15 00:43:06,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-15 00:43:06,957 [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-15 00:43:06,958 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-15 00:43:06,958 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:06,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-15 00:43:06,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:06,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:06,964 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:06,970 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:06,970 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:06,975 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:06,982 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:06,982 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-15 00:43:07,411 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-15 00:43:07,411 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-15 00:43:07,415 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:07,416 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:07,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:07,421 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-15 00:43:07,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:07,435 [ 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-15 00:43:07,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-15 00:43:07,454 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-15 00:43:07,456 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-15 00:43:07,457 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-15 00:43:07,457 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-15 00:43:07,457 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-15 00:43:07,458 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-15 00:43:07,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:07,612 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:07,668 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:07,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:07,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:07,715 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:07,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58bb8df0> has no local changes
2024-05-15 00:43:07,722 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:07,732 [ scc.git] DEBUG [detached HEAD f4a02ee] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:07,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:07,733 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:08,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-15 00:43:08,055 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:08,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-15 00:43:08,055 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:08,066 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:08,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:08,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:08,077 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:08,077 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:08,077 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,082 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:08,122 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,127 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:08,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:08,174 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58391fa0> has no local changes
2024-05-15 00:43:08,174 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:08,184 [ scc.git] DEBUG [detached HEAD 6ec3320] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:08,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:08,184 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:08,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-15 00:43:08,487 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:08,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-15 00:43:08,487 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,493 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:08,498 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:08,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:08,503 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:08,511 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:08,511 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:08,511 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,517 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:08,561 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:08,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:08,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:08,606 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:08,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe5833bf70> has no local changes
2024-05-15 00:43:08,612 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:08,620 [ scc.git] DEBUG [detached HEAD 203b79c] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:08,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:08,621 [ scc.git] INFO Overriding base-branch from master to main
2024-05-15 00:43:08,621 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:08,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-15 00:43:09,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-15 00:43:09,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-15 00:43:10,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-15 00:43:10,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-15 00:43:11,447 [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-15 00:43:11,916 [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-15 00:43:12,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-15 00:43:12,776 [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-15 00:43:12,777 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-15 00:43:12,777 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:12,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-15 00:43:12,777 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:12,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:12,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-15 00:43:12,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:12,791 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-15 00:43:12,798 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-15 00:43:12,805 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:12,806 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-15 00:43:13,308 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-15 00:43:13,308 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-15 00:43:13,312 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:13,312 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:13,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:13,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-15 00:43:13,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:13,331 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-15 00:43:13,362 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-15 00:43:13,362 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-15 00:43:13,362 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:43:13,363 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:43:13,374 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-15 00:43:13,380 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-15 00:43:13,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:13,544 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-15 00:43:13,551 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-15 00:43:13,557 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-15 00:43:13,563 [ scc.config] DEBUG Found github.token
2024-05-15 00:43:13,563 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-15 00:43:13,564 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:13,607 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:13,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:13,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:13,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:13,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58320b50> has no local changes
2024-05-15 00:43:13,665 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:13,675 [ scc.git] DEBUG [detached HEAD 7955d53] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:13,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:13,675 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:13,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-15 00:43:13,985 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:13,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-15 00:43:13,985 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:13,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:13,991 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:13,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:13,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:14,005 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:14,011 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:14,011 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:14,011 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:14,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:14,018 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:14,061 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:14,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:14,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:14,108 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:14,115 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58349e50> has no local changes
2024-05-15 00:43:14,115 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:14,126 [ scc.git] DEBUG [detached HEAD 60f5ea0] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:14,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:14,127 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:14,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-15 00:43:14,416 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:14,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-15 00:43:14,417 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:14,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:14,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:14,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:14,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:14,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:14,444 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:14,445 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:14,445 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:14,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:14,451 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:14,492 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:14,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:14,501 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:14,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:14,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58270940> has no local changes
2024-05-15 00:43:14,560 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:14,570 [ scc.git] DEBUG [detached HEAD 75f9b1c] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:14,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:14,570 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:14,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-15 00:43:15,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-15 00:43:15,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-15 00:43:16,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-15 00:43:16,800 [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-15 00:43:17,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-15 00:43:17,644 [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-15 00:43:17,645 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-15 00:43:17,645 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:17,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-15 00:43:17,645 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:17,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:17,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-15 00:43:17,657 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:17,657 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-15 00:43:17,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-15 00:43:17,668 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:17,668 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-15 00:43:18,084 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-15 00:43:18,084 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-15 00:43:18,088 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:18,089 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:18,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:18,094 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-15 00:43:18,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:18,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-15 00:43:18,150 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-15 00:43:18,150 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-15 00:43:18,150 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:43:18,150 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:43:18,156 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-15 00:43:18,164 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-15 00:43:18,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:18,333 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-15 00:43:18,341 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-15 00:43:18,346 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-15 00:43:18,351 [ scc.config] DEBUG Found github.token
2024-05-15 00:43:18,351 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-15 00:43:18,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:18,400 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:18,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:18,406 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:18,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:18,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe582d5310> has no local changes
2024-05-15 00:43:18,453 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:18,463 [ scc.git] DEBUG [detached HEAD f9fe0e9] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:18,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:18,463 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-15 00:43:18,464 [ scc.repo] DEBUG ## PRs found:
2024-05-15 00:43:18,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-15 00:43:19,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-15 00:43:19,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-15 00:43:20,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-15 00:43:20,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-15 00:43:21,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-15 00:43:21,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-15 00:43:22,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-15 00:43:22,605 [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-15 00:43:23,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-15 00:43:23,466 [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-15 00:43:23,467 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-15 00:43:23,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-15 00:43:24,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-15 00:43:24,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-15 00:43:25,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-15 00:43:25,410 [ scc.repo] DEBUG ## Branches found:
2024-05-15 00:43:25,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-15 00:43:25,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:25,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:25,416 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-15 00:43:25,422 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-15 00:43:25,422 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-15 00:43:25,442 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-15 00:43:25,452 [ scc.git] DEBUG Already up to date.
2024-05-15 00:43:25,453 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-15 00:43:25,937 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-15 00:43:25,937 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-15 00:43:25,943 [ scc.git] DEBUG ## Unique users: []
2024-05-15 00:43:25,943 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:25,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:25,950 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-15 00:43:25,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:25,965 [ 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-15 00:43:26,040 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-15 00:43:26,041 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-15 00:43:26,041 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-15 00:43:26,041 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-15 00:43:26,048 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-15 00:43:26,054 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-15 00:43:26,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:26,210 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-15 00:43:26,222 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-15 00:43:26,229 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#66](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-15 00:43:26,234 [ scc.config] DEBUG Found github.token
2024-05-15 00:43:26,234 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-15 00:43:26,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-15 00:43:26,277 [ scc.git] DEBUG Get sha1 of %s
2024-05-15 00:43:26,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-15 00:43:26,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:26,324 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:26,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe58270bb0> has no local changes
2024-05-15 00:43:26,331 [ 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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:26,341 [ scc.git] DEBUG [detached HEAD 96d0778] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:26,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:26,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-15 00:43:26,417 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-15 00:43:26,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:26,630 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-15 00:43:26,634 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-15 00:43:27,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:27,040 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-15 00:43:27,044 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-15 00:43:27,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:27,449 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-15 00:43:27,454 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-15 00:43:27,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:27,862 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-15 00:43:28,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:28,268 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-15 00:43:28,272 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-15 00:43:28,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:28,678 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-15 00:43:28,684 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-15 00:43:29,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:29,089 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-15 00:43:29,094 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-15 00:43:29,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:29,494 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-15 00:43:29,499 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-15 00:43:29,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:29,906 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-15 00:43:29,911 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-15 00:43:30,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:30,319 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-15 00:43:30,323 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-15 00:43:30,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:30,735 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-15 00:43:30,740 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-15 00:43:31,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:31,136 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-15 00:43:31,140 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-15 00:43:31,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:31,551 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-15 00:43:31,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:31,961 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-15 00:43:32,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:32,373 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-15 00:43:32,378 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-15 00:43:32,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:32,803 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-15 00:43:33,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:33,222 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-15 00:43:33,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:33,621 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-15 00:43:33,626 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-15 00:43:34,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:34,037 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-15 00:43:34,042 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-15 00:43:34,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:34,454 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-15 00:43:34,459 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-15 00:43:34,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:34,866 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-15 00:43:34,871 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-15 00:43:35,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-15 00:43:35,271 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-15 00:43:35,272 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-15 00:43:35,347 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe5c08f460> has local changes
2024-05-15 00:43:35,348 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
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'
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 471 will-moore 'Z projection disabled tooltip'
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#66 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/66/)'
2024-05-15 00:43:35,361 [ scc.git] DEBUG [detached HEAD e99a5f4] merge master -Dorg -Ssuccess-only
2024-05-15 00:43:35,361 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-15 00:43:35,362 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-15 00:43:35,362 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,362 [ scc.merge] INFO
2024-05-15 00:43:35,362 [ scc.merge] INFO
2024-05-15 00:43:35,362 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-15 00:43:35,362 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,362 [ scc.merge] INFO
2024-05-15 00:43:35,362 [ scc.merge] INFO
2024-05-15 00:43:35,362 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-15 00:43:35,362 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,362 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-15 00:43:35,362 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,362 [ scc.merge] INFO
2024-05-15 00:43:35,363 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-15 00:43:35,363 [ scc.merge] INFO
2024-05-15 00:43:35,363 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-15 00:43:35,363 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-15 00:43:35,363 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,363 [ scc.merge] INFO
2024-05-15 00:43:35,363 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,363 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-15 00:43:35,363 [ scc.merge] INFO
2024-05-15 00:43:35,363 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-15 00:43:35,363 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-15 00:43:35,364 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,364 [ scc.merge] INFO
2024-05-15 00:43:35,364 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-15 00:43:35,364 [ scc.merge] INFO
2024-05-15 00:43:35,364 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-15 00:43:35,364 [ scc.merge] INFO
2024-05-15 00:43:35,364 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-15 00:43:35,364 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-15 00:43:35,364 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,364 [ scc.merge] INFO
2024-05-15 00:43:35,364 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,364 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-15 00:43:35,365 [ scc.merge] INFO
2024-05-15 00:43:35,365 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-15 00:43:35,365 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,365 [ scc.merge] INFO
2024-05-15 00:43:35,365 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-15 00:43:35,365 [ scc.merge] INFO
2024-05-15 00:43:35,365 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-15 00:43:35,365 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,365 [ scc.merge] INFO
2024-05-15 00:43:35,365 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-15 00:43:35,365 [ scc.merge] INFO
2024-05-15 00:43:35,365 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-15 00:43:35,365 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-15 00:43:35,365 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-15 00:43:35,366 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,366 [ scc.merge] INFO
2024-05-15 00:43:35,366 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-15 00:43:35,366 [ scc.merge] INFO
2024-05-15 00:43:35,366 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-15 00:43:35,366 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-15 00:43:35,366 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,366 [ scc.merge] INFO
2024-05-15 00:43:35,366 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,366 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-15 00:43:35,366 [ scc.merge] INFO
2024-05-15 00:43:35,367 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-15 00:43:35,367 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,367 [ scc.merge] INFO
2024-05-15 00:43:35,367 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-15 00:43:35,367 [ scc.merge] INFO
2024-05-15 00:43:35,367 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-15 00:43:35,367 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-15 00:43:35,367 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,367 [ scc.merge] INFO
2024-05-15 00:43:35,367 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-15 00:43:35,367 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-15 00:43:35,368 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-15 00:43:35,368 [ scc.merge] INFO
2024-05-15 00:43:35,368 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-15 00:43:35,368 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,368 [ scc.merge] INFO
2024-05-15 00:43:35,368 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,368 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-15 00:43:35,368 [ scc.merge] INFO
2024-05-15 00:43:35,368 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-15 00:43:35,369 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,369 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-15 00:43:35,369 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,369 [ scc.merge] INFO
2024-05-15 00:43:35,369 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,369 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-15 00:43:35,369 [ scc.merge] INFO
2024-05-15 00:43:35,369 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-15 00:43:35,369 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,369 [ scc.merge] INFO
2024-05-15 00:43:35,369 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,369 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-15 00:43:35,369 [ scc.merge] INFO
2024-05-15 00:43:35,369 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-15 00:43:35,369 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,369 [ scc.merge] INFO
2024-05-15 00:43:35,369 [ scc.merge] INFO Merged PRs:
2024-05-15 00:43:35,370 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-15 00:43:35,370 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-15 00:43:35,370 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-15 00:43:35,370 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,370 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-15 00:43:35,370 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,370 [ scc.merge] INFO
2024-05-15 00:43:35,370 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,370 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-15 00:43:35,371 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-15 00:43:35,371 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-15 00:43:35,371 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,371 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-15 00:43:35,371 [ scc.merge] INFO
2024-05-15 00:43:35,371 [ scc.merge] INFO Repository: ome/scripts
2024-05-15 00:43:35,371 [ scc.merge] INFO Excluded PRs:
2024-05-15 00:43:35,371 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-15 00:43:35,372 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-15 00:43:35,372 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-15 00:43:35,372 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-15 00:43:35,372 [ scc.merge] INFO Already up to date.
2024-05-15 00:43:35,372 [ scc.merge] INFO
2024-05-15 00:43:35,372 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-15 00:43:35,372 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-15 00:43:35,372 [ scc.merge] INFO
2024-05-15 00:43:35,372 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-15 00:43:35,372 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-15 00:43:35,378 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-15 00:43:35,384 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-15 00:43:35,389 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-15 00:43:35,395 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-15 00:43:35,401 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-15 00:43:35,406 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-15 00:43:35,412 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-15 00:43:35,417 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-15 00:43:35,423 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-15 00:43:35,428 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-15 00:43:35,433 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-15 00:43:35,438 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-15 00:43:35,443 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-15 00:43:35,448 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-15 00:43:35,453 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-15 00:43:35,458 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-15 00:43:35,463 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-15 00:43:35,467 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-15 00:43:35,472 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-15 00:43:35,477 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-15 00:43:35,482 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-15 00:43:35,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-15 00:43:35,486 [ scc.git] DEBUG Calling 'git remote'
2024-05-15 00:43:35,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 051bb65] 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 f8b3e4c7
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 54c3753
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 1d31bf5] 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-15 00:44:21,420 [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-15 00:44:30,467 [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-15 00:44:33,074 [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-15 00:44:37,737 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-15 00:45:23,992 [ 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/0008761a/images/svgs/logo.svg){kind=logo}
