Skipping 97 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Generated by OMERO-plugins-push#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:43:18,001 [ scc.git] DEBUG [detached HEAD 1565267] merge master -Dorg -Ssuccess-only
2024-05-29 00:43:18,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:43:18,002 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:43:18,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-29 00:43:18,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-29 00:43:19,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-29 00:43:19,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-29 00:43:20,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-29 00:43:20,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-29 00:43:21,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-29 00:43:21,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-05-29 00:43:21,751 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-29 00:43:22,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-29 00:43:22,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-29 00:43:23,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-29 00:43:23,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-29 00:43:24,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-29 00:43:24,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-29 00:43:25,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-05-29 00:43:25,071 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-29 00:43:25,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-29 00:43:26,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-29 00:43:26,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-29 00:43:27,027 [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-29 00:43:27,485 [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-29 00:43:27,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-29 00:43:28,391 [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-29 00:43:28,391 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-29 00:43:28,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-29 00:43:29,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-29 00:43:29,824 [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-29 00:43:30,287 [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-29 00:43:30,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-29 00:43:31,219 [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-29 00:43:31,220 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-29 00:43:31,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-29 00:43:32,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-29 00:43:32,124 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:43:32,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-29 00:43:32,124 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:32,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:32,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:43:32,135 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:43:32,135 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:43:32,140 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:43:32,146 [ scc.git] DEBUG Already up to date.
2024-05-29 00:43:32,147 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-29 00:43:33,027 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-29 00:43:33,027 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-29 00:43:33,032 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-29 00:43:33,578 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-29 00:43:33,578 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-29 00:43:33,584 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-29 00:43:34,407 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-29 00:43:34,407 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-29 00:43:34,412 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-29 00:43:34,819 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-29 00:43:34,819 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-29 00:43:34,827 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:43:34,827 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:34,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:34,833 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-29 00:43:34,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:34,845 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-29 00:43:34,935 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-29 00:43:34,941 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-29 00:43:34,943 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-29 00:43:35,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:35,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-29 00:43:35,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:35,112 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-29 00:43:35,211 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-29 00:43:35,212 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-29 00:43:35,212 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-29 00:43:35,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:35,218 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-29 00:43:35,218 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-29 00:43:35,218 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-29 00:43:35,218 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-29 00:43:35,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:35,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-29 00:43:35,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:35,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-29 00:43:35,963 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-29 00:43:35,963 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-29 00:43:35,963 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-29 00:43:35,963 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-29 00:43:35,963 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-29 00:43:35,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:35,971 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-29 00:43:35,971 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-29 00:43:35,972 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-29 00:43:35,972 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-29 00:43:35,972 [ scc.git] DEBUG src/index.html | 1 +
2024-05-29 00:43:35,972 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-29 00:43:35,974 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-29 00:43:35,975 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-29 00:43:35,975 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-29 00:43:36,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:36,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-29 00:43:36,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:36,158 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-29 00:43:36,172 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:36,176 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-29 00:43:36,176 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-29 00:43:36,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:36,562 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:43:36,609 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:36,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:36,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:43:36,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:43:36,664 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc1d8f70> has no local changes
2024-05-29 00:43:36,664 [ 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 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:43:36,673 [ scc.git] DEBUG [detached HEAD 3ea11768] merge master -Dorg -Ssuccess-only
2024-05-29 00:43:36,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:43:36,674 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:43:37,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-29 00:43:37,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-29 00:43:37,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-29 00:43:38,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-29 00:43:38,988 [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-29 00:43:39,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-29 00:43:39,845 [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-29 00:43:39,846 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-29 00:43:39,846 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:43:39,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-29 00:43:39,846 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:39,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:39,852 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:43:39,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:43:39,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:43:39,862 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:43:39,867 [ scc.git] DEBUG Already up to date.
2024-05-29 00:43:39,867 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-29 00:43:40,311 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-29 00:43:40,311 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-29 00:43:40,317 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:43:40,317 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:40,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:40,323 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-29 00:43:40,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:40,334 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-29 00:43:40,355 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-29 00:43:40,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:40,358 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-29 00:43:40,358 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-29 00:43:40,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:40,530 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:43:40,578 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:40,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:40,584 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:43:40,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:43:40,633 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc1d8e20> has no local changes
2024-05-29 00:43:40,634 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:43:40,643 [ scc.git] DEBUG [detached HEAD cb31646] merge master -Dorg -Ssuccess-only
2024-05-29 00:43:40,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:43:40,643 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:43:41,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-29 00:43:41,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-29 00:43:41,505 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-29 00:43:42,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-29 00:43:42,545 [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-29 00:43:43,075 [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-29 00:43:43,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-29 00:43:44,037 [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-29 00:43:44,038 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-29 00:43:44,038 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:43:44,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-29 00:43:44,038 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:44,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:44,045 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:43:44,050 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:43:44,050 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:43:44,056 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:43:44,062 [ scc.git] DEBUG Already up to date.
2024-05-29 00:43:44,062 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-29 00:43:44,455 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-29 00:43:44,455 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-29 00:43:44,460 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:43:44,460 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:44,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:44,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-29 00:43:44,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:44,475 [ 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-29 00:43:44,486 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:44,490 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-29 00:43:44,490 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-29 00:43:44,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:44,653 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:43:44,691 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:44,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:44,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:43:44,732 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:43:44,739 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc17dd30> has no local changes
2024-05-29 00:43:44,739 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:43:44,748 [ scc.git] DEBUG [detached HEAD dd2ff26] merge master -Dorg -Ssuccess-only
2024-05-29 00:43:44,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:43:44,748 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:43:45,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-29 00:43:45,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-29 00:43:46,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-29 00:43:46,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-29 00:43:47,108 [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-29 00:43:47,621 [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-29 00:43:48,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-29 00:43:48,549 [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-29 00:43:48,550 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-29 00:43:49,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-29 00:43:49,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-29 00:43:50,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-29 00:43:50,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-29 00:43:51,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-29 00:43:51,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-29 00:43:51,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-05-29 00:43:51,947 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-29 00:43:52,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-29 00:43:52,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-29 00:43:53,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-29 00:43:53,787 [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-29 00:43:54,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-29 00:43:54,724 [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-29 00:43:54,725 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-29 00:43:54,725 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:43:54,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-29 00:43:54,726 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:54,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:54,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:43:54,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:43:54,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:43:54,744 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:43:54,750 [ scc.git] DEBUG Already up to date.
2024-05-29 00:43:54,751 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-29 00:43:55,245 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-29 00:43:55,246 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-29 00:43:55,251 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-29 00:43:56,135 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-29 00:43:56,135 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-29 00:43:56,141 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-29 00:43:56,561 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-29 00:43:56,562 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-29 00:43:56,566 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:43:56,567 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:56,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:56,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-29 00:43:56,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:56,585 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-29 00:43:56,613 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-29 00:43:56,614 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:56,617 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-29 00:43:56,617 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-29 00:43:56,617 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-29 00:43:56,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:56,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-29 00:43:56,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:56,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-29 00:43:56,891 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-29 00:43:56,891 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-29 00:43:56,891 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-29 00:43:56,892 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-29 00:43:56,892 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:56,896 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-29 00:43:56,896 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-29 00:43:56,896 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-29 00:43:56,896 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-29 00:43:56,896 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-29 00:43:56,896 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-29 00:43:56,896 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-29 00:43:56,896 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-29 00:43:57,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:57,249 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-29 00:43:57,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:57,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-29 00:43:57,286 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-29 00:43:57,287 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:43:57,290 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-29 00:43:57,290 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-29 00:43:57,290 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-29 00:43:57,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:43:57,671 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:43:57,715 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:43:57,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:43:57,720 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:43:57,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:43:57,767 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc195310> has no local changes
2024-05-29 00:43:57,767 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:43:57,778 [ scc.git] DEBUG [detached HEAD 9fc4407] merge master -Dorg -Ssuccess-only
2024-05-29 00:43:57,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:43:57,778 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:43:58,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-29 00:43:58,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-29 00:43:59,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-29 00:43:59,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-29 00:44:00,177 [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-29 00:44:00,663 [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-29 00:44:01,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-29 00:44:01,580 [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-29 00:44:01,581 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-29 00:44:01,581 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:01,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-29 00:44:01,581 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:01,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:01,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:01,595 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:01,595 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:01,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:01,608 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:01,608 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-29 00:44:01,996 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-29 00:44:01,996 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-29 00:44:02,001 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:02,002 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:02,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:02,007 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-29 00:44:02,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:02,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-29 00:44:02,027 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:02,030 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-29 00:44:02,030 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-29 00:44:02,030 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-29 00:44:02,030 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-29 00:44:02,030 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-29 00:44:02,030 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-29 00:44:02,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:02,196 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:02,236 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:02,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:02,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:02,281 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:02,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc15bb50> has no local changes
2024-05-29 00:44:02,289 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:02,297 [ scc.git] DEBUG [detached HEAD a92c929] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:02,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:02,298 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:02,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-29 00:44:03,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-29 00:44:03,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-29 00:44:04,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-29 00:44:04,769 [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-29 00:44:05,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-29 00:44:05,650 [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-29 00:44:05,651 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-29 00:44:06,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-29 00:44:06,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-29 00:44:07,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-29 00:44:07,602 [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-29 00:44:08,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-29 00:44:08,541 [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-29 00:44:08,542 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-29 00:44:08,542 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:08,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-29 00:44:08,543 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:08,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:08,548 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:08,553 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:08,553 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:08,558 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:08,564 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:08,564 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-29 00:44:09,095 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-29 00:44:09,095 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-29 00:44:09,100 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-29 00:44:09,821 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-29 00:44:09,821 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-29 00:44:09,827 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:09,827 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:09,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:09,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-29 00:44:09,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:09,843 [ 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-29 00:44:09,910 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-29 00:44:09,910 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-29 00:44:09,911 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-29 00:44:09,911 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-29 00:44:09,911 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:44:09,911 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:44:09,918 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-29 00:44:09,926 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-29 00:44:10,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:10,083 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-29 00:44:10,090 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-29 00:44:10,098 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-29 00:44:10,104 [ scc.config] DEBUG Found github.token
2024-05-29 00:44:10,104 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-29 00:44:10,104 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-29 00:44:10,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:10,119 [ 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-29 00:44:10,162 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-29 00:44:10,163 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-29 00:44:10,163 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-29 00:44:10,163 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:44:10,163 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:44:10,169 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-29 00:44:10,177 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-29 00:44:10,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:10,500 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-29 00:44:10,507 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-29 00:44:10,513 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/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-29 00:44:10,519 [ scc.config] DEBUG Found github.token
2024-05-29 00:44:10,519 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-29 00:44:10,519 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:10,562 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:10,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:10,568 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:10,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:10,624 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc187f10> has no local changes
2024-05-29 00:44:10,624 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:10,633 [ scc.git] DEBUG [detached HEAD 8f1e5da] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:10,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:10,634 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:11,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-29 00:44:11,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-29 00:44:11,548 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-29 00:44:12,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-29 00:44:12,627 [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-29 00:44:13,114 [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-29 00:44:13,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-29 00:44:14,107 [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-29 00:44:14,108 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-29 00:44:14,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-29 00:44:14,622 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-29 00:44:15,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-29 00:44:15,692 [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-29 00:44:16,248 [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-29 00:44:16,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-29 00:44:17,233 [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-29 00:44:17,234 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-29 00:44:17,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-29 00:44:17,698 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-29 00:44:18,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-29 00:44:18,765 [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-29 00:44:19,257 [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-29 00:44:19,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-29 00:44:20,181 [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-29 00:44:20,182 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-29 00:44:20,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-29 00:44:21,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-29 00:44:21,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-29 00:44:22,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-29 00:44:22,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-29 00:44:23,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-29 00:44:23,081 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:23,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-29 00:44:23,082 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:23,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:23,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:23,096 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:23,096 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:23,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:23,114 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:23,114 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-29 00:44:23,501 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-29 00:44:23,501 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-29 00:44:23,508 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-29 00:44:23,921 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-29 00:44:23,921 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-29 00:44:23,928 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-29 00:44:24,335 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-29 00:44:24,335 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-29 00:44:24,341 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:24,342 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:24,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:24,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-29 00:44:24,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:24,366 [ 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-29 00:44:24,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:24,383 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-29 00:44:24,383 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-29 00:44:24,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:24,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-29 00:44:24,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:24,587 [ 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-29 00:44:24,653 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-29 00:44:24,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:24,657 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-29 00:44:24,657 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-29 00:44:24,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:24,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-29 00:44:24,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:25,003 [ 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-29 00:44:25,023 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-29 00:44:25,023 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:25,028 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-29 00:44:25,028 [ scc.git] DEBUG package.json | 2 +-
2024-05-29 00:44:25,028 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-29 00:44:25,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:25,413 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:25,464 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:25,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:25,470 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:25,511 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:25,519 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc113640> has no local changes
2024-05-29 00:44:25,519 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:26,278 [ scc.git] DEBUG [detached HEAD 4131f52] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:26,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:26,279 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:26,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-29 00:44:27,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-29 00:44:27,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-29 00:44:28,039 [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-29 00:44:28,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-29 00:44:28,911 [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-29 00:44:28,912 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-29 00:44:28,912 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:28,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-29 00:44:28,912 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:28,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:28,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:28,922 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:28,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:28,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:28,934 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:28,934 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-29 00:44:29,290 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-29 00:44:29,291 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-29 00:44:29,295 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:29,296 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:29,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:29,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-29 00:44:29,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:29,312 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-29 00:44:29,322 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:29,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:29,485 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:29,530 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:29,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:29,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:29,595 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:29,602 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc1b7df0> has no local changes
2024-05-29 00:44:29,602 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:29,612 [ scc.git] DEBUG [detached HEAD 454f022] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:29,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:29,612 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:30,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-29 00:44:30,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-29 00:44:31,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-29 00:44:31,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-29 00:44:32,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-29 00:44:32,473 [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-29 00:44:32,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-29 00:44:33,399 [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-29 00:44:33,400 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-29 00:44:33,400 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:33,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-29 00:44:33,400 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:33,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:33,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:33,411 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:33,411 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:33,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:33,422 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:33,422 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-29 00:44:33,996 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-29 00:44:33,996 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-29 00:44:34,001 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:34,001 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:34,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:34,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-29 00:44:34,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:34,019 [ 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-29 00:44:34,029 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-29 00:44:34,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:34,032 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-29 00:44:34,032 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-29 00:44:34,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:34,199 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:34,237 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:34,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:34,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:34,278 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:34,284 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc0ca520> has no local changes
2024-05-29 00:44:34,285 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:34,292 [ scc.git] DEBUG [detached HEAD 91c4390] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:34,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:34,293 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:34,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-29 00:44:35,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-29 00:44:35,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-29 00:44:36,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-29 00:44:36,637 [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-29 00:44:37,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-29 00:44:37,643 [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-29 00:44:37,644 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-29 00:44:37,645 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:37,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-29 00:44:37,645 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:37,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:37,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:37,658 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:37,658 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:37,664 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:37,670 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:37,670 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-29 00:44:38,078 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-29 00:44:38,078 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-29 00:44:38,082 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:38,083 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:38,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:38,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-29 00:44:38,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:38,100 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-29 00:44:38,137 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG Auto-merging setup.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-29 00:44:38,137 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:44:38,137 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:44:38,144 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-29 00:44:38,151 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-29 00:44:38,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:38,311 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-29 00:44:38,318 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-29 00:44:38,324 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2024-05-29 00:44:38,329 [ scc.config] DEBUG Found github.token
2024-05-29 00:44:38,330 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-29 00:44:38,330 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:38,372 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:38,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:38,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:38,448 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:38,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc0ca670> has no local changes
2024-05-29 00:44:38,470 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:38,498 [ scc.git] DEBUG [detached HEAD 64ebc8b] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:38,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:38,499 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:38,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-29 00:44:39,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70 HTTP/1.1" 200 None
2024-05-29 00:44:39,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70/comments HTTP/1.1" 200 None
2024-05-29 00:44:40,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-29 00:44:40,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-29 00:44:41,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-29 00:44:41,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-29 00:44:42,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/7a15634965188ef2714e60d4e60db61e6b1efc0f?per_page=1 HTTP/1.1" 200 2
2024-05-29 00:44:42,104 [ scc.repo] DEBUG - PR 70 jburel 'Toml support'
2024-05-29 00:44:42,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-29 00:44:43,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-29 00:44:43,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-29 00:44:43,990 [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-29 00:44:44,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-29 00:44:44,862 [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-29 00:44:44,863 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-29 00:44:44,863 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:44,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-29 00:44:44,863 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:44,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:44,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:44,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:44,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:44,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:44,890 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:44,891 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-29 00:44:45,327 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-29 00:44:45,327 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-29 00:44:45,334 [ scc.git] DEBUG Calling 'git fetch origin pull/70/head'
2024-05-29 00:44:45,923 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-29 00:44:45,924 [ scc.git] DEBUG * branch refs/pull/70/head -> FETCH_HEAD
2024-05-29 00:44:45,926 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:45,926 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:45,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:45,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-29 00:44:45,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:45,948 [ 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-29 00:44:45,970 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-29 00:44:45,974 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-29 00:44:45,975 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-29 00:44:45,975 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-29 00:44:45,975 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-29 00:44:45,980 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-29 00:44:45,981 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-29 00:44:45,982 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-29 00:44:45,983 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-29 00:44:45,984 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-29 00:44:45,984 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-29 00:44:46,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:46,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-29 00:44:46,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:46,153 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 70 (Toml support) 7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-29 00:44:46,168 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:44:46,172 [ scc.git] DEBUG py-setup | 3 +--
2024-05-29 00:44:46,172 [ scc.git] DEBUG utils | 18 ++++++++++++------
2024-05-29 00:44:46,172 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 8 deletions(-)
2024-05-29 00:44:46,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:46,561 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:46,605 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:46,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:46,612 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:46,675 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:46,682 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc0ca580> has no local changes
2024-05-29 00:44:46,682 [ 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'
- PR 70 jburel 'Toml support'
Generated by OMERO-plugins-push#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:46,694 [ scc.git] DEBUG [detached HEAD 5db043a] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:46,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:46,694 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:47,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-29 00:44:47,004 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:47,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-29 00:44:47,004 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,012 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:47,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:47,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:47,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:47,029 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:47,029 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:47,029 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,035 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:47,076 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:47,126 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:47,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc122d60> has no local changes
2024-05-29 00:44:47,133 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:47,143 [ scc.git] DEBUG [detached HEAD 6558c11] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:47,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:47,143 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:47,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-29 00:44:47,443 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:47,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-29 00:44:47,443 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,449 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:47,456 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:47,456 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:47,464 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:47,473 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:47,473 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:47,473 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,481 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:47,532 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:47,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:47,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:47,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:47,590 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc0dbbb0> has no local changes
2024-05-29 00:44:47,591 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:47,601 [ scc.git] DEBUG [detached HEAD 1f20e02] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:47,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:47,602 [ scc.git] INFO Overriding base-branch from master to main
2024-05-29 00:44:47,602 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:47,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-29 00:44:48,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-29 00:44:48,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-29 00:44:49,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-29 00:44:49,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-29 00:44:50,430 [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-29 00:44:50,923 [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-29 00:44:51,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-29 00:44:51,838 [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-29 00:44:51,838 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-29 00:44:51,839 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:51,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-29 00:44:51,839 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:51,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:51,845 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-29 00:44:51,850 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:51,850 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-29 00:44:51,855 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-29 00:44:51,861 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:51,861 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-29 00:44:52,277 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-29 00:44:52,278 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-29 00:44:52,282 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:52,282 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:52,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:52,288 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-29 00:44:52,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:52,299 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-29 00:44:52,320 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-29 00:44:52,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-29 00:44:52,320 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:44:52,321 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:44:52,326 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-29 00:44:52,333 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-29 00:44:52,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:52,502 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-29 00:44:52,509 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-29 00:44:52,516 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-29 00:44:52,522 [ scc.config] DEBUG Found github.token
2024-05-29 00:44:52,522 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-29 00:44:52,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:52,564 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:52,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:52,569 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:52,613 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:52,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc17db80> has no local changes
2024-05-29 00:44:52,620 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:52,628 [ scc.git] DEBUG [detached HEAD 4454152] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:52,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:52,628 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:52,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-29 00:44:52,942 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:52,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-29 00:44:52,942 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:52,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:52,948 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:52,953 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:52,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:52,959 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:52,965 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:52,965 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:52,965 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:52,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:52,972 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:53,016 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:53,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:53,022 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:53,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:53,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc0f9e50> has no local changes
2024-05-29 00:44:53,071 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:53,080 [ scc.git] DEBUG [detached HEAD 07991b5] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:53,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:53,081 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:53,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-29 00:44:53,378 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:53,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-29 00:44:53,378 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:53,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:53,385 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:53,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:53,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:53,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:53,420 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:53,420 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:53,420 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:53,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:53,429 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:53,471 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:53,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:53,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:53,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:53,526 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc046490> has no local changes
2024-05-29 00:44:53,526 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:53,536 [ scc.git] DEBUG [detached HEAD b290406] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:53,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:53,537 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:53,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-29 00:44:54,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-29 00:44:54,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-29 00:44:55,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-29 00:44:55,819 [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-29 00:44:56,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-29 00:44:56,733 [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-29 00:44:56,734 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-29 00:44:56,734 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:44:56,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-29 00:44:56,734 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:56,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:56,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:44:56,745 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:44:56,746 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:44:56,751 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:44:56,758 [ scc.git] DEBUG Already up to date.
2024-05-29 00:44:56,758 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-29 00:44:57,185 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-29 00:44:57,185 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-29 00:44:57,191 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:44:57,191 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:57,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:57,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-29 00:44:57,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:57,207 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-29 00:44:57,239 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-29 00:44:57,239 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-29 00:44:57,239 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:44:57,240 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:44:57,246 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-29 00:44:57,254 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-29 00:44:57,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:44:57,427 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-29 00:44:57,434 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-29 00:44:57,443 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-29 00:44:57,451 [ scc.config] DEBUG Found github.token
2024-05-29 00:44:57,452 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-29 00:44:57,452 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:44:57,508 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:44:57,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:44:57,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:44:57,572 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:44:57,586 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc08bbe0> has no local changes
2024-05-29 00:44:57,587 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:44:57,608 [ scc.git] DEBUG [detached HEAD b5b2f50] merge master -Dorg -Ssuccess-only
2024-05-29 00:44:57,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:44:57,609 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-29 00:44:57,610 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:44:58,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-29 00:44:58,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-29 00:44:59,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-29 00:44:59,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-29 00:44:59,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-29 00:45:00,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-29 00:45:00,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-29 00:45:01,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-29 00:45:01,763 [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-29 00:45:02,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-29 00:45:02,632 [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-29 00:45:02,634 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-29 00:45:03,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-29 00:45:03,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-29 00:45:04,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-29 00:45:04,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-29 00:45:04,614 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:45:04,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-29 00:45:04,614 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:45:04,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:45:04,622 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-29 00:45:04,630 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:45:04,630 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-29 00:45:04,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-29 00:45:04,657 [ scc.git] DEBUG Already up to date.
2024-05-29 00:45:04,658 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-29 00:45:05,123 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-29 00:45:05,123 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-29 00:45:05,128 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:45:05,128 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:45:05,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:45:05,134 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-29 00:45:05,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:45:05,149 [ 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-29 00:45:05,198 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-29 00:45:05,198 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-29 00:45:05,198 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-29 00:45:05,199 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-29 00:45:05,205 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-29 00:45:05,212 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-29 00:45:05,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:05,387 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-29 00:45:05,394 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-29 00:45:05,401 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#80](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-29 00:45:05,407 [ scc.config] DEBUG Found github.token
2024-05-29 00:45:05,407 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-29 00:45:05,407 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:45:05,449 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:45:05,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:45:05,457 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:45:05,504 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:45:05,511 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcc097d30> has no local changes
2024-05-29 00:45:05,511 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:45:05,521 [ scc.git] DEBUG [detached HEAD 255408d] merge master -Dorg -Ssuccess-only
2024-05-29 00:45:05,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:05,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:45:05,602 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-29 00:45:05,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:05,822 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-29 00:45:05,828 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-29 00:45:06,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:06,240 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-29 00:45:06,245 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-29 00:45:06,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:06,690 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-29 00:45:06,696 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-29 00:45:07,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:07,101 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-29 00:45:07,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:07,512 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-29 00:45:07,519 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-29 00:45:07,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:07,935 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-29 00:45:07,940 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-29 00:45:08,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:08,376 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-29 00:45:08,381 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-29 00:45:08,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:08,800 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-29 00:45:08,805 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-29 00:45:09,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:09,219 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-29 00:45:09,224 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-29 00:45:09,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:09,834 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-29 00:45:09,843 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-29 00:45:10,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:10,248 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-29 00:45:10,254 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-29 00:45:10,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:10,660 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-29 00:45:10,665 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-29 00:45:11,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:11,077 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-29 00:45:11,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:11,492 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-29 00:45:11,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:11,934 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-29 00:45:11,941 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-29 00:45:12,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:12,353 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-29 00:45:12,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:12,764 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-29 00:45:13,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:13,162 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-29 00:45:13,167 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-29 00:45:13,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:13,584 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-29 00:45:13,590 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-29 00:45:13,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:13,999 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-29 00:45:14,005 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-29 00:45:14,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:14,423 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-29 00:45:14,429 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-29 00:45:14,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:45:14,830 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-29 00:45:14,830 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:45:14,920 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4fcccf9130> has local changes
2024-05-29 00:45:14,920 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 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'
- PR 70 jburel 'Toml support'
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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/80/)'
2024-05-29 00:45:14,935 [ scc.git] DEBUG [detached HEAD 2d07993] merge master -Dorg -Ssuccess-only
2024-05-29 00:45:14,935 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-29 00:45:14,935 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-29 00:45:14,935 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,935 [ scc.merge] INFO
2024-05-29 00:45:14,935 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-29 00:45:14,936 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-29 00:45:14,936 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-29 00:45:14,936 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-29 00:45:14,936 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-29 00:45:14,936 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-29 00:45:14,936 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-29 00:45:14,936 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-29 00:45:14,936 [ scc.merge] INFO
2024-05-29 00:45:14,936 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-29 00:45:14,936 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,936 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-29 00:45:14,937 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-29 00:45:14,937 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-29 00:45:14,937 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-29 00:45:14,937 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-29 00:45:14,937 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-29 00:45:14,937 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-29 00:45:14,937 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,937 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,937 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-29 00:45:14,937 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-29 00:45:14,938 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-29 00:45:14,938 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-29 00:45:14,938 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-29 00:45:14,938 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-29 00:45:14,938 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-29 00:45:14,938 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-29 00:45:14,938 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,938 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,938 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-29 00:45:14,938 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Merged PRs:
2024-05-29 00:45:14,939 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-29 00:45:14,939 [ scc.merge] INFO - PR 70 jburel 'Toml support'
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-29 00:45:14,939 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,939 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,939 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-29 00:45:14,939 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,939 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-29 00:45:14,939 [ scc.merge] INFO
2024-05-29 00:45:14,939 [ scc.merge] INFO Repository: ome/scripts
2024-05-29 00:45:14,940 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:45:14,940 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-29 00:45:14,940 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-29 00:45:14,940 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-29 00:45:14,940 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-29 00:45:14,940 [ scc.merge] INFO Already up to date.
2024-05-29 00:45:14,940 [ scc.merge] INFO
2024-05-29 00:45:14,940 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-29 00:45:14,940 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-29 00:45:14,940 [ scc.merge] INFO
2024-05-29 00:45:14,940 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-29 00:45:14,940 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-29 00:45:14,946 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-29 00:45:14,952 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-29 00:45:14,957 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-29 00:45:14,963 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-29 00:45:14,969 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-29 00:45:14,976 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-29 00:45:14,982 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-29 00:45:14,988 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-29 00:45:14,994 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:14,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:14,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-29 00:45:15,000 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-29 00:45:15,005 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-29 00:45:15,011 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-29 00:45:15,017 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-29 00:45:15,023 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-29 00:45:15,030 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-29 00:45:15,035 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-29 00:45:15,041 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-29 00:45:15,047 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-29 00:45:15,053 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-29 00:45:15,058 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-29 00:45:15,063 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-29 00:45:15,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-29 00:45:15,069 [ scc.git] DEBUG Calling 'git remote'
2024-05-29 00:45:15,075 [ 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 dfff4b2] 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 3d9e3b87
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 7b7a637
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 7688c54
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 18c485d] 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-29 00:46:03,405 [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-29 00:46:12,602 [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-29 00:46:15,253 [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-29 00:46:19,957 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-29 00:47:07,726 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
