Console Output
Skipping 86 KB..
Full Logto 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:41:47,480 [ scc.git] DEBUG [detached HEAD 18b2f9f] merge master -Dorg -Ssuccess-only
2024-05-14 00:41:47,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:41:47,481 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:41:47,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-14 00:41:48,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-14 00:41:48,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-14 00:41:49,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-14 00:41:49,836 [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-14 00:41:50,339 [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-14 00:41:50,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-14 00:41:51,248 [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-14 00:41:51,249 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-14 00:41:51,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-14 00:41:52,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-14 00:41:52,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-14 00:41:53,106 [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-14 00:41:53,584 [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-14 00:41:54,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-14 00:41:54,439 [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-14 00:41:54,440 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-14 00:41:55,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/554 HTTP/1.1" 200 None
2024-05-14 00:41:55,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5 HTTP/1.1" 200 None
2024-05-14 00:41:56,149 [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-14 00:41:56,615 [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-14 00:41:57,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/902c4461b9479c4681e6bf71114616299e2adde5 HTTP/1.1" 200 None
2024-05-14 00:41:57,536 [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-14 00:41:57,537 [ scc.repo] DEBUG - PR 554 jburel 'Update publish'
2024-05-14 00:41:58,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-14 00:41:58,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-14 00:41:58,936 [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-14 00:41:59,410 [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-14 00:41:59,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-14 00:42:00,352 [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-14 00:42:00,353 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-14 00:42:00,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-14 00:42:01,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-14 00:42:01,282 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:01,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-14 00:42:01,282 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:01,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:01,289 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:01,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:01,297 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:01,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:01,314 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:01,314 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-14 00:42:01,723 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-14 00:42:01,723 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-14 00:42:01,729 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-05-14 00:42:02,218 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-14 00:42:02,218 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-05-14 00:42:02,223 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-14 00:42:02,761 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-14 00:42:02,762 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-14 00:42:02,768 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-14 00:42:03,453 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-14 00:42:03,453 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-14 00:42:03,461 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:03,461 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:03,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:03,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-14 00:42:03,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:03,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-14 00:42:03,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-14 00:42:03,659 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-14 00:42:03,659 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-14 00:42:03,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:03,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-14 00:42:03,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:03,834 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-14 00:42:03,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:03,868 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-14 00:42:03,868 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-14 00:42:04,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:04,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-14 00:42:04,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:04,240 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-14 00:42:04,416 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-14 00:42:04,416 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-14 00:42:04,416 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-14 00:42:04,417 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:04,427 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-14 00:42:04,427 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-14 00:42:04,428 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-14 00:42:04,428 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-14 00:42:04,428 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-14 00:42:04,428 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-14 00:42:04,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:04,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-14 00:42:04,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:04,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-14 00:42:04,865 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-14 00:42:04,865 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-14 00:42:04,865 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-14 00:42:04,865 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-14 00:42:04,865 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-14 00:42:04,866 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:04,873 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++-
2024-05-14 00:42:04,874 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-14 00:42:04,874 [ scc.git] DEBUG omero_figure/views.py | 69 ++++++++++++++++++++++
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/index.html | 1 +
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++-
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-14 00:42:04,874 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-14 00:42:04,875 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-14 00:42:04,875 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-14 00:42:04,875 [ scc.git] DEBUG 14 files changed, 189 insertions(+), 13 deletions(-)
2024-05-14 00:42:05,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:05,049 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:05,090 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:05,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:05,096 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:05,134 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:05,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0440a29be0> has no local changes
2024-05-14 00:42:05,145 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:05,155 [ scc.git] DEBUG [detached HEAD 1190d8ea] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:05,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:05,156 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:05,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-14 00:42:06,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-14 00:42:06,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-14 00:42:06,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-14 00:42:07,379 [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-14 00:42:07,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-14 00:42:08,235 [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-14 00:42:08,236 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-14 00:42:08,236 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:08,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-14 00:42:08,236 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:08,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:08,243 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:08,249 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:08,249 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:08,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:08,262 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:08,263 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-14 00:42:08,636 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-14 00:42:08,636 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-14 00:42:08,641 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:08,642 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:08,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:08,648 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-14 00:42:08,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:08,663 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-14 00:42:08,679 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-14 00:42:08,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:08,682 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-14 00:42:08,682 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-14 00:42:08,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:08,841 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:08,881 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:08,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:08,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:08,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:08,940 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409f8550> has no local changes
2024-05-14 00:42:08,941 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:08,964 [ scc.git] DEBUG [detached HEAD 1362ede] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:08,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:08,964 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:09,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-14 00:42:09,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-14 00:42:09,806 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-14 00:42:10,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-14 00:42:10,732 [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-14 00:42:11,220 [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-14 00:42:11,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-14 00:42:12,096 [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-14 00:42:12,097 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-14 00:42:12,097 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:12,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-14 00:42:12,097 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:12,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:12,103 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:12,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:12,113 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:12,120 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:12,127 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:12,127 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-14 00:42:12,531 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-14 00:42:12,531 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-14 00:42:12,536 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:12,536 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:12,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:12,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-14 00:42:12,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:12,557 [ 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-14 00:42:12,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:12,574 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-14 00:42:12,574 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-14 00:42:12,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:12,737 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:12,780 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:12,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:12,786 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:12,825 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:12,833 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409eb9d0> has no local changes
2024-05-14 00:42:12,834 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:12,845 [ scc.git] DEBUG [detached HEAD 94a6782] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:12,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:12,845 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:13,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-14 00:42:13,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-14 00:42:14,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-14 00:42:14,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-14 00:42:15,088 [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-14 00:42:15,555 [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-14 00:42:16,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-14 00:42:16,434 [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-14 00:42:16,435 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-14 00:42:16,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-14 00:42:17,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-14 00:42:17,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-14 00:42:18,311 [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-14 00:42:18,800 [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-14 00:42:19,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-14 00:42:19,665 [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-14 00:42:19,666 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-14 00:42:20,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-14 00:42:20,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-14 00:42:21,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-14 00:42:21,547 [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-14 00:42:22,028 [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-14 00:42:22,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-14 00:42:22,906 [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-14 00:42:22,907 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-14 00:42:23,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-14 00:42:23,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-14 00:42:24,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-14 00:42:24,759 [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-14 00:42:25,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-14 00:42:25,681 [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-14 00:42:25,682 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-14 00:42:25,682 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:25,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-14 00:42:25,682 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:25,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:25,688 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:25,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:25,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:25,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:25,722 [ scc.git] DEBUG Updating 9d8d147..54c3753
2024-05-14 00:42:26,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/470 HTTP/1.1" 200 None
2024-05-14 00:42:26,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/474 HTTP/1.1" 200 None
2024-05-14 00:42:26,893 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-14 00:42:27,276 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-14 00:42:27,277 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-14 00:42:27,282 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-14 00:42:27,953 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-14 00:42:27,953 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-14 00:42:27,959 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-14 00:42:28,511 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-14 00:42:28,511 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-14 00:42:28,514 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-14 00:42:28,972 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-14 00:42:28,973 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-14 00:42:28,978 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:28,978 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:28,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:28,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-14 00:42:28,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:28,999 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-14 00:42:29,030 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-14 00:42:29,030 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:29,034 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-14 00:42:29,034 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-14 00:42:29,034 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-14 00:42:29,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:29,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-14 00:42:29,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:29,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-14 00:42:29,313 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-14 00:42:29,313 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-14 00:42:29,313 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-14 00:42:29,313 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-14 00:42:29,314 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:29,318 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-14 00:42:29,318 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-14 00:42:29,318 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-14 00:42:29,318 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-14 00:42:29,318 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-14 00:42:29,318 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-14 00:42:29,318 [ scc.git] DEBUG 6 files changed, 294 insertions(+), 6 deletions(-)
2024-05-14 00:42:29,318 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-14 00:42:29,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:29,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-14 00:42:29,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:29,631 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-14 00:42:29,646 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:29,649 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-14 00:42:29,649 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-14 00:42:30,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:30,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-14 00:42:30,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:30,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-14 00:42:30,054 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-14 00:42:30,055 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:30,057 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-14 00:42:30,058 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-14 00:42:30,058 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-14 00:42:30,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:30,448 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:30,494 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:30,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:30,500 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:30,540 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:30,549 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409d85b0> has no local changes
2024-05-14 00:42:30,549 [ 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)
Updating 9d8d147..54c3753
Previously merged:
- PR 470 will-moore 'Tile loading improvements, spinners and error handling'
- PR 474 will-moore 'Image loading error handling'
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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:30,561 [ scc.git] DEBUG [detached HEAD 4bda041] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:30,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:30,562 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:31,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-14 00:42:31,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-14 00:42:32,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-14 00:42:32,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-14 00:42:33,283 [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-14 00:42:33,748 [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-14 00:42:34,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-14 00:42:34,593 [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-14 00:42:34,594 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-14 00:42:34,594 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:34,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-14 00:42:34,595 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:34,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:34,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:34,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:34,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:34,617 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:34,628 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:34,628 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-14 00:42:35,014 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-14 00:42:35,014 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-14 00:42:35,020 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:35,020 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:35,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:35,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-14 00:42:35,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:35,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-14 00:42:35,063 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:35,066 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-14 00:42:35,067 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-14 00:42:35,067 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-14 00:42:35,067 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-14 00:42:35,067 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-14 00:42:35,067 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-14 00:42:35,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:35,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:35,275 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:35,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:35,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:35,335 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:35,343 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409fd4f0> has no local changes
2024-05-14 00:42:35,343 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:35,355 [ scc.git] DEBUG [detached HEAD c2c9de8] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:35,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:35,355 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:35,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-14 00:42:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-14 00:42:36,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-14 00:42:37,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-14 00:42:37,712 [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-14 00:42:38,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-14 00:42:38,569 [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-14 00:42:38,571 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-14 00:42:39,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-14 00:42:39,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-14 00:42:40,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-14 00:42:40,473 [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-14 00:42:40,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-14 00:42:41,339 [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-14 00:42:41,339 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-14 00:42:41,339 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:41,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-14 00:42:41,340 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:41,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:41,346 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:41,353 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:41,353 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:41,360 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:41,367 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:41,368 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-14 00:42:41,785 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-14 00:42:41,785 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-14 00:42:41,792 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-14 00:42:42,488 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-14 00:42:42,489 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-14 00:42:42,497 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:42,497 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:42,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:42,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-14 00:42:42,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:42,534 [ 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-14 00:42:42,616 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-14 00:42:42,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-14 00:42:42,617 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-14 00:42:42,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-14 00:42:42,621 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:42:42,624 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:42:42,639 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-14 00:42:42,655 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-14 00:42:42,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:42,821 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-14 00:42:42,833 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-14 00:42:42,843 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-14 00:42:42,852 [ scc.config] DEBUG Found github.token
2024-05-14 00:42:42,852 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-14 00:42:42,852 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-14 00:42:42,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:42,875 [ 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-14 00:42:42,949 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-14 00:42:42,949 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-14 00:42:42,949 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-14 00:42:42,950 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:42:42,951 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:42:42,963 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-14 00:42:42,977 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-14 00:42:43,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:43,236 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-14 00:42:43,246 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-14 00:42:43,256 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/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-14 00:42:43,264 [ scc.config] DEBUG Found github.token
2024-05-14 00:42:43,264 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-14 00:42:43,265 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:43,316 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:43,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:43,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:43,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:43,383 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409d8550> has no local changes
2024-05-14 00:42:43,383 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:43,394 [ scc.git] DEBUG [detached HEAD e20a4f9] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:43,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:43,395 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:43,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-14 00:42:44,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-14 00:42:44,287 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-14 00:42:44,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-14 00:42:45,296 [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-14 00:42:45,779 [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-14 00:42:46,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-14 00:42:46,660 [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-14 00:42:46,662 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-14 00:42:47,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-14 00:42:47,133 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-14 00:42:47,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-14 00:42:48,172 [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-14 00:42:48,637 [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-14 00:42:49,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-14 00:42:49,552 [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-14 00:42:49,554 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-14 00:42:50,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-14 00:42:50,025 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-14 00:42:50,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-14 00:42:50,974 [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-14 00:42:51,442 [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-14 00:42:51,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-14 00:42:52,340 [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-14 00:42:52,341 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-14 00:42:52,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-14 00:42:53,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-14 00:42:53,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-14 00:42:54,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-14 00:42:54,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-14 00:42:55,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-14 00:42:55,576 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:42:55,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-14 00:42:55,577 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:55,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:55,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:42:55,598 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:42:55,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:42:55,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:42:55,617 [ scc.git] DEBUG Already up to date.
2024-05-14 00:42:55,618 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-14 00:42:56,032 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-14 00:42:56,032 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-14 00:42:56,040 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-14 00:42:56,457 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-14 00:42:56,458 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-14 00:42:56,466 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-14 00:42:56,871 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-14 00:42:56,871 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-14 00:42:56,878 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:42:56,878 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:56,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:56,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-14 00:42:56,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:56,923 [ 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-14 00:42:56,953 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:56,962 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-14 00:42:56,963 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-14 00:42:57,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:57,133 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-14 00:42:57,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:57,169 [ 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-14 00:42:57,224 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-14 00:42:57,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:57,229 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-14 00:42:57,229 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-14 00:42:57,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:57,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-14 00:42:57,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:57,558 [ 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-14 00:42:57,585 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-14 00:42:57,586 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:42:57,590 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-14 00:42:57,590 [ scc.git] DEBUG package.json | 2 +-
2024-05-14 00:42:57,590 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-14 00:42:57,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:42:57,946 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:42:58,043 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:42:58,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:42:58,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:42:58,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:42:58,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409c7fd0> has no local changes
2024-05-14 00:42:58,142 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:42:58,161 [ scc.git] DEBUG [detached HEAD cf598bc] merge master -Dorg -Ssuccess-only
2024-05-14 00:42:58,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:42:58,163 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:42:58,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-14 00:42:58,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-14 00:42:59,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-14 00:42:59,858 [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-14 00:43:00,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-14 00:43:01,168 [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-14 00:43:01,169 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-14 00:43:01,169 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:01,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-14 00:43:01,170 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:01,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:01,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:01,182 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:01,182 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:01,188 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:01,195 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:01,195 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-14 00:43:01,570 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-14 00:43:01,570 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-14 00:43:01,576 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:01,576 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:01,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:01,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-14 00:43:01,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:01,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-14 00:43:01,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:43:01,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:01,782 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:01,824 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:01,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:01,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:01,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:01,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0440169340> has no local changes
2024-05-14 00:43:01,885 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:01,895 [ scc.git] DEBUG [detached HEAD 16996db] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:01,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:01,895 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:02,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-14 00:43:02,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-14 00:43:03,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-14 00:43:03,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-14 00:43:04,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-14 00:43:04,765 [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-14 00:43:05,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-14 00:43:05,638 [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-14 00:43:05,638 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-14 00:43:05,639 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:05,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-14 00:43:05,639 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:05,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:05,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:05,652 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:05,652 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:05,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:05,664 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:05,664 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-14 00:43:06,054 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-14 00:43:06,054 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-14 00:43:06,060 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:06,060 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:06,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:06,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-14 00:43:06,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:06,083 [ 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-14 00:43:06,146 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-14 00:43:06,147 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:43:06,151 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-14 00:43:06,151 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-14 00:43:06,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:06,314 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:06,362 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:06,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:06,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:06,408 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:06,415 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04401b4a00> has no local changes
2024-05-14 00:43:06,415 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:06,424 [ scc.git] DEBUG [detached HEAD 806a1bd] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:06,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:06,425 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:06,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-14 00:43:07,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-14 00:43:07,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-14 00:43:08,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-14 00:43:08,715 [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-14 00:43:09,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-14 00:43:09,694 [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-14 00:43:09,695 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-14 00:43:09,695 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:09,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-14 00:43:09,696 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:09,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:09,703 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:09,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:09,709 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:09,715 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:09,722 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:09,722 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-14 00:43:10,219 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-14 00:43:10,219 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-14 00:43:10,225 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:10,226 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:10,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:10,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-14 00:43:10,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:10,253 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-14 00:43:10,327 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG Auto-merging setup.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-14 00:43:10,328 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:43:10,328 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:43:10,338 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-14 00:43:10,348 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-14 00:43:10,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:10,507 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-14 00:43:10,519 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-14 00:43:10,531 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-05-14 00:43:10,539 [ scc.config] DEBUG Found github.token
2024-05-14 00:43:10,540 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-14 00:43:10,540 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:10,591 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:10,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:10,601 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:10,650 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:10,662 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409ebe80> has no local changes
2024-05-14 00:43:10,663 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:10,683 [ scc.git] DEBUG [detached HEAD 2fcaa4a] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:10,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:10,684 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:11,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-14 00:43:11,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-14 00:43:11,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-14 00:43:12,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-14 00:43:13,375 [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-14 00:43:13,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-14 00:43:14,344 [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-14 00:43:14,344 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-14 00:43:14,344 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:14,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-14 00:43:14,345 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:14,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:14,351 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:14,356 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:14,356 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:14,362 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:14,367 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:14,367 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-14 00:43:14,847 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-14 00:43:14,848 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-14 00:43:14,856 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:14,856 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:14,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:14,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-14 00:43:14,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:14,882 [ 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-14 00:43:14,904 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-14 00:43:14,910 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-14 00:43:14,911 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-14 00:43:14,911 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-14 00:43:14,913 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-14 00:43:14,914 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-14 00:43:14,914 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-14 00:43:14,914 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-14 00:43:14,914 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-14 00:43:14,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-14 00:43:14,915 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-14 00:43:15,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:15,076 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:15,125 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:15,132 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:15,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:15,201 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04409c7df0> has no local changes
2024-05-14 00:43:15,201 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:15,215 [ scc.git] DEBUG [detached HEAD 14531bb] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:15,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:15,216 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:15,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-14 00:43:15,523 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:15,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-14 00:43:15,523 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:15,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:15,540 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:15,541 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:15,549 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:15,557 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:15,557 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:15,557 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:15,568 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:15,620 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:15,628 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:15,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:15,696 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0440192fa0> has no local changes
2024-05-14 00:43:15,696 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:15,711 [ scc.git] DEBUG [detached HEAD 7427aca] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:15,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:15,712 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:15,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-14 00:43:15,963 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:15,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-14 00:43:15,963 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:15,971 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:15,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:15,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:15,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:15,995 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:15,995 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:15,996 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:15,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:16,004 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:16,055 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:16,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:16,064 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:16,120 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:16,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0440170f70> has no local changes
2024-05-14 00:43:16,131 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:16,145 [ scc.git] DEBUG [detached HEAD e78f953] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:16,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:16,146 [ scc.git] INFO Overriding base-branch from master to main
2024-05-14 00:43:16,146 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:16,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-14 00:43:17,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-14 00:43:17,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-14 00:43:18,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-14 00:43:18,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-14 00:43:18,973 [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-14 00:43:19,447 [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-14 00:43:20,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-14 00:43:20,428 [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-14 00:43:20,429 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-14 00:43:20,429 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:20,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-14 00:43:20,429 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:20,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:20,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-14 00:43:20,440 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:20,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-14 00:43:20,446 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-14 00:43:20,453 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:20,453 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-14 00:43:20,951 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-14 00:43:20,951 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-14 00:43:20,958 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:20,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:20,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:20,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-14 00:43:20,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:20,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-14 00:43:20,985 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-14 00:43:20,986 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-14 00:43:20,986 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:43:20,986 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:43:20,992 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-14 00:43:20,998 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-14 00:43:21,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:21,154 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-14 00:43:21,160 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-14 00:43:21,166 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-14 00:43:21,172 [ scc.config] DEBUG Found github.token
2024-05-14 00:43:21,172 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-14 00:43:21,172 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:21,213 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:21,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:21,220 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:21,265 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:21,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0440107430> has no local changes
2024-05-14 00:43:21,274 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:21,286 [ scc.git] DEBUG [detached HEAD 0c0d15a] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:21,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:21,287 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:21,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-14 00:43:21,637 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:21,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-14 00:43:21,637 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:21,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:21,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:21,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:21,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:21,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:21,666 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:21,666 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:21,666 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:21,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:21,673 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:21,722 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:21,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:21,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:21,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:21,777 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f044016fe50> has no local changes
2024-05-14 00:43:21,777 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:21,787 [ scc.git] DEBUG [detached HEAD 25d8494] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:21,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:21,788 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:22,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-14 00:43:22,132 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:22,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-14 00:43:22,132 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:22,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:22,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:22,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:22,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:22,153 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:22,162 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:22,162 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:22,162 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:22,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:22,169 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:22,213 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:22,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:22,220 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:22,267 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:22,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f044008a940> has no local changes
2024-05-14 00:43:22,275 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:22,284 [ scc.git] DEBUG [detached HEAD 0ac1607] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:22,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:22,285 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:22,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-14 00:43:23,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-14 00:43:23,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-14 00:43:23,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-14 00:43:24,464 [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-14 00:43:24,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-14 00:43:25,333 [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-14 00:43:25,334 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-14 00:43:25,334 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:25,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-14 00:43:25,334 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:25,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:25,342 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-14 00:43:25,349 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:25,349 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-14 00:43:25,356 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-14 00:43:25,364 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:25,364 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-14 00:43:25,747 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-14 00:43:25,747 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-14 00:43:25,753 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:25,753 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:25,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:25,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-14 00:43:25,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:25,779 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-14 00:43:25,795 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-14 00:43:25,795 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-14 00:43:25,795 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:43:25,796 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:43:25,806 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-14 00:43:25,817 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-14 00:43:26,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:26,049 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-14 00:43:26,056 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-14 00:43:26,063 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-14 00:43:26,068 [ scc.config] DEBUG Found github.token
2024-05-14 00:43:26,069 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-14 00:43:26,069 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:26,109 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:26,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:26,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:26,158 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:26,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04400d09d0> has no local changes
2024-05-14 00:43:26,166 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:26,175 [ scc.git] DEBUG [detached HEAD a44351e] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:26,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:26,176 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-14 00:43:26,176 [ scc.repo] DEBUG ## PRs found:
2024-05-14 00:43:26,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-14 00:43:27,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-14 00:43:27,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-14 00:43:28,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-14 00:43:28,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-14 00:43:29,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-14 00:43:29,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-14 00:43:30,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-14 00:43:30,562 [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-14 00:43:31,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-14 00:43:31,469 [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-14 00:43:31,470 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-14 00:43:32,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-14 00:43:32,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-14 00:43:33,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-14 00:43:33,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-14 00:43:33,532 [ scc.repo] DEBUG ## Branches found:
2024-05-14 00:43:33,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-14 00:43:33,533 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:33,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:33,539 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-14 00:43:33,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-14 00:43:33,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-14 00:43:33,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-14 00:43:33,560 [ scc.git] DEBUG Already up to date.
2024-05-14 00:43:33,560 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-14 00:43:33,941 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-14 00:43:33,941 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-14 00:43:33,946 [ scc.git] DEBUG ## Unique users: []
2024-05-14 00:43:33,946 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:33,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:33,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-14 00:43:33,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:33,969 [ 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-14 00:43:34,044 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-14 00:43:34,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-14 00:43:34,044 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-14 00:43:34,045 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-14 00:43:34,053 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-14 00:43:34,061 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-14 00:43:34,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:34,220 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-14 00:43:34,229 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-14 00:43:34,237 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#65](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-14 00:43:34,243 [ scc.config] DEBUG Found github.token
2024-05-14 00:43:34,243 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-14 00:43:34,244 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-14 00:43:34,285 [ scc.git] DEBUG Get sha1 of %s
2024-05-14 00:43:34,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-14 00:43:34,293 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:34,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:34,343 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f044008abb0> has no local changes
2024-05-14 00:43:34,344 [ 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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:34,354 [ scc.git] DEBUG [detached HEAD 70b42f8] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:34,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:34,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-14 00:43:34,435 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-14 00:43:34,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:34,644 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-14 00:43:34,650 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-14 00:43:35,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:35,049 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-14 00:43:35,055 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-14 00:43:35,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:35,495 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-14 00:43:35,502 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-14 00:43:35,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:35,966 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-14 00:43:36,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:36,411 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-14 00:43:36,417 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-14 00:43:36,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:36,827 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-14 00:43:36,834 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-14 00:43:37,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:37,295 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-14 00:43:37,301 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-14 00:43:37,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:37,748 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-14 00:43:37,755 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-14 00:43:38,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:38,178 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-14 00:43:38,186 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-14 00:43:38,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:38,593 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-14 00:43:38,599 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-14 00:43:38,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:39,005 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-14 00:43:39,013 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-14 00:43:39,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:39,429 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-14 00:43:39,435 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-14 00:43:39,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:39,842 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-14 00:43:40,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:40,247 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-14 00:43:40,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:40,669 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-14 00:43:40,679 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-14 00:43:41,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:41,113 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-14 00:43:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:41,524 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-14 00:43:41,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:41,966 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-14 00:43:41,975 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-14 00:43:42,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:42,383 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-14 00:43:42,388 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-14 00:43:42,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:42,818 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-14 00:43:42,824 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-14 00:43:43,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:43,230 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-14 00:43:43,238 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-14 00:43:43,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-14 00:43:43,661 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-14 00:43:43,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-14 00:43:43,772 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0441b85ac0> has local changes
2024-05-14 00:43:43,772 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 366 dependabot[bot] 'Bump omero-figure from `ded0caa` to `f8b3e4c`'
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)
Updating 9d8d147..54c3753
Previously merged:
- PR 470 will-moore 'Tile loading improvements, spinners and error handling'
- PR 474 will-moore 'Image loading error handling'
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#65 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/65/)'
2024-05-14 00:43:43,787 [ scc.git] DEBUG [detached HEAD fe6bfb7] merge master -Dorg -Ssuccess-only
2024-05-14 00:43:43,787 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-14 00:43:43,787 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-14 00:43:43,788 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 366 dependabot[bot] 'Bump omero-figure from `ded0caa` to `f8b3e4c`'
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-14 00:43:43,788 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-14 00:43:43,788 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-14 00:43:43,788 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-14 00:43:43,788 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-14 00:43:43,788 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-14 00:43:43,788 [ scc.merge] INFO
2024-05-14 00:43:43,788 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-14 00:43:43,788 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-14 00:43:43,788 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-14 00:43:43,789 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-14 00:43:43,789 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-14 00:43:43,789 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-14 00:43:43,789 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-14 00:43:43,789 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-14 00:43:43,789 [ scc.merge] INFO
2024-05-14 00:43:43,789 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-14 00:43:43,789 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-14 00:43:43,789 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-14 00:43:43,789 [ scc.merge] INFO Updating 9d8d147..54c3753
2024-05-14 00:43:43,790 [ scc.merge] INFO Previously merged:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 470 will-moore 'Tile loading improvements, spinners and error handling'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 474 will-moore 'Image loading error handling'
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-14 00:43:43,790 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-14 00:43:43,790 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-14 00:43:43,790 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-14 00:43:43,790 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-14 00:43:43,790 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-14 00:43:43,790 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-14 00:43:43,790 [ scc.merge] INFO
2024-05-14 00:43:43,790 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-14 00:43:43,791 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Merged PRs:
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,791 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-14 00:43:43,791 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,791 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-14 00:43:43,791 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,791 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-14 00:43:43,792 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-14 00:43:43,792 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-14 00:43:43,792 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Repository: ome/scripts
2024-05-14 00:43:43,792 [ scc.merge] INFO Excluded PRs:
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-14 00:43:43,792 [ scc.merge] INFO Already up to date.
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-14 00:43:43,792 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-14 00:43:43,792 [ scc.merge] INFO
2024-05-14 00:43:43,792 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-14 00:43:43,792 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-14 00:43:43,799 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-14 00:43:43,805 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-14 00:43:43,811 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-14 00:43:43,818 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-14 00:43:43,829 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-14 00:43:43,840 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-14 00:43:43,846 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-14 00:43:43,854 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-14 00:43:43,863 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-14 00:43:43,871 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-14 00:43:43,880 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-14 00:43:43,887 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-14 00:43:43,894 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-14 00:43:43,902 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-14 00:43:43,911 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-14 00:43:43,917 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-14 00:43:43,924 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-14 00:43:43,931 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-14 00:43:43,937 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-14 00:43:43,943 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-14 00:43:43,949 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-14 00:43:43,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-14 00:43:43,955 [ scc.git] DEBUG Calling 'git remote'
2024-05-14 00:43:43,961 [ 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 7f50d2b] 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 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD ca3edd6] 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-14 00:44:32,864 [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-14 00:44:42,371 [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-14 00:44:44,830 [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-14 00:44:49,695 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-14 00:45:39,377 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
