Console Output
Skipping 83 KB..
Full Logcc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:43:24,745 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:24,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:24,751 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:43:24,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:43:24,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfba28bf10> has no local changes
2024-05-31 00:43:24,798 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
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'
Generated by OMERO-plugins-push#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:43:24,807 [ scc.git] DEBUG [detached HEAD f6d2194] merge master -Dorg -Ssuccess-only
2024-05-31 00:43:24,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:43:24,808 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:43:25,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-31 00:43:25,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-31 00:43:26,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-31 00:43:26,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-31 00:43:27,140 [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-31 00:43:27,597 [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-31 00:43:28,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-31 00:43:28,463 [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-31 00:43:28,464 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-31 00:43:28,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-31 00:43:29,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-31 00:43:29,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-31 00:43:30,410 [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-31 00:43:30,886 [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-31 00:43:31,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-31 00:43:31,795 [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-31 00:43:31,796 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-31 00:43:32,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-31 00:43:32,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-31 00:43:33,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-31 00:43:33,649 [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-31 00:43:34,090 [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-31 00:43:34,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-31 00:43:34,952 [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-31 00:43:34,953 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-31 00:43:35,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-31 00:43:35,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-31 00:43:36,357 [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-31 00:43:36,821 [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-31 00:43:37,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-31 00:43:37,669 [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-31 00:43:37,670 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-31 00:43:38,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-31 00:43:38,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-31 00:43:38,576 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:43:38,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-31 00:43:38,576 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:38,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:38,585 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:43:38,592 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:43:38,592 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:43:38,604 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:43:38,612 [ scc.git] DEBUG Already up to date.
2024-05-31 00:43:38,613 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-31 00:43:39,324 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-31 00:43:39,324 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-31 00:43:39,329 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-31 00:43:39,820 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-31 00:43:39,820 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-31 00:43:39,827 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-31 00:43:40,524 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-31 00:43:40,524 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-31 00:43:40,531 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-31 00:43:40,921 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-31 00:43:40,921 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-31 00:43:40,927 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:43:40,927 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:40,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:40,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-31 00:43:40,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:40,950 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-31 00:43:41,072 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-31 00:43:41,083 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-31 00:43:41,083 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-31 00:43:41,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:41,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-31 00:43:41,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:41,272 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-31 00:43:41,365 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-31 00:43:41,365 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-31 00:43:41,365 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-31 00:43:41,366 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:41,372 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-31 00:43:41,372 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-31 00:43:41,372 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-31 00:43:41,373 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-31 00:43:41,373 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-31 00:43:41,373 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-31 00:43:41,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:41,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-31 00:43:41,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:41,685 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-31 00:43:41,827 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-31 00:43:41,827 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-31 00:43:41,827 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-31 00:43:41,827 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-31 00:43:41,827 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-31 00:43:41,828 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:41,836 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-31 00:43:41,836 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-31 00:43:41,836 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/index.html | 1 +
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-31 00:43:41,836 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-31 00:43:41,837 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-31 00:43:41,837 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-31 00:43:41,837 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-31 00:43:41,837 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-31 00:43:41,837 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-31 00:43:41,837 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-31 00:43:42,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:42,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-31 00:43:42,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:42,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-31 00:43:42,171 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:42,175 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-31 00:43:42,175 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-31 00:43:42,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:42,501 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:43:42,554 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:42,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:42,561 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:43:42,608 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:43:42,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb91dfb80> has no local changes
2024-05-31 00:43:42,618 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:43:42,631 [ scc.git] DEBUG [detached HEAD d21850f0] merge master -Dorg -Ssuccess-only
2024-05-31 00:43:42,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:43:42,632 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:43:42,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-31 00:43:43,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-31 00:43:43,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-31 00:43:44,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-31 00:43:44,869 [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-31 00:43:45,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-31 00:43:45,715 [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-31 00:43:45,716 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-31 00:43:45,716 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:43:45,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-31 00:43:45,716 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:45,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:45,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:43:45,732 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:43:45,732 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:43:45,742 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:43:45,751 [ scc.git] DEBUG Already up to date.
2024-05-31 00:43:45,751 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-31 00:43:46,122 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-31 00:43:46,123 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-31 00:43:46,129 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:43:46,129 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:46,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:46,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-31 00:43:46,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:46,155 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-31 00:43:46,168 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-31 00:43:46,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:46,172 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-31 00:43:46,172 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-31 00:43:46,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:46,342 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:43:46,439 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:46,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:46,459 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:43:46,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:43:46,594 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb8190670> has no local changes
2024-05-31 00:43:46,594 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:43:46,605 [ scc.git] DEBUG [detached HEAD d77b7d2] merge master -Dorg -Ssuccess-only
2024-05-31 00:43:46,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:43:46,606 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:43:46,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-31 00:43:47,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-31 00:43:47,306 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-31 00:43:47,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-31 00:43:48,288 [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-31 00:43:48,790 [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-31 00:43:49,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-31 00:43:49,657 [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-31 00:43:49,658 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-31 00:43:49,658 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:43:49,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-31 00:43:49,658 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:49,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:49,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:43:49,676 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:43:49,676 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:43:49,682 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:43:49,688 [ scc.git] DEBUG Already up to date.
2024-05-31 00:43:49,688 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-31 00:43:50,061 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-31 00:43:50,061 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-31 00:43:50,067 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:43:50,067 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:50,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:50,076 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-31 00:43:50,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:50,093 [ 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-31 00:43:50,110 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:43:50,115 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-31 00:43:50,115 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-31 00:43:50,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:43:50,275 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:43:50,323 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:50,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:50,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:43:50,384 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:43:50,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb81982e0> has no local changes
2024-05-31 00:43:50,394 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:43:50,406 [ scc.git] DEBUG [detached HEAD ada318e] merge master -Dorg -Ssuccess-only
2024-05-31 00:43:50,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:43:50,407 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:43:50,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-31 00:43:51,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-31 00:43:51,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-31 00:43:52,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-31 00:43:52,649 [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-31 00:43:53,137 [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-31 00:43:53,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-31 00:43:54,012 [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-31 00:43:54,013 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-31 00:43:54,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-31 00:43:54,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-31 00:43:55,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-31 00:43:55,935 [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-31 00:43:56,429 [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-31 00:43:56,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-31 00:43:57,283 [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-31 00:43:57,284 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-31 00:43:57,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-31 00:43:58,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-31 00:43:58,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-31 00:43:59,082 [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-31 00:43:59,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-31 00:43:59,939 [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-31 00:43:59,940 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-31 00:43:59,940 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:43:59,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-31 00:43:59,940 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:43:59,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:43:59,946 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:43:59,952 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:43:59,952 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:43:59,958 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:43:59,965 [ scc.git] DEBUG Already up to date.
2024-05-31 00:43:59,965 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-31 00:44:00,420 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-31 00:44:00,420 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-31 00:44:00,426 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-31 00:44:01,326 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-31 00:44:01,326 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-31 00:44:01,331 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-31 00:44:01,745 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-31 00:44:01,745 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-31 00:44:01,752 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:01,752 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:01,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:01,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-31 00:44:01,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:01,773 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-31 00:44:01,806 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-31 00:44:01,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:01,811 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-31 00:44:01,811 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-31 00:44:01,811 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-31 00:44:02,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:02,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-31 00:44:02,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:02,031 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-31 00:44:02,071 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-31 00:44:02,072 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-31 00:44:02,072 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-31 00:44:02,072 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-31 00:44:02,072 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:02,076 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-31 00:44:02,077 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-31 00:44:02,077 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-31 00:44:02,077 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-31 00:44:02,077 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-31 00:44:02,077 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-31 00:44:02,077 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-31 00:44:02,077 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-31 00:44:02,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:02,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-31 00:44:02,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:02,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-31 00:44:02,471 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-31 00:44:02,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:02,475 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-31 00:44:02,475 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-31 00:44:02,475 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-31 00:44:02,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:02,841 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:02,884 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:02,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:02,892 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:02,940 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:02,950 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb9235fa0> has no local changes
2024-05-31 00:44:02,951 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:02,966 [ scc.git] DEBUG [detached HEAD 19d1d0f] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:02,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:02,967 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:03,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-31 00:44:03,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-31 00:44:04,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-31 00:44:04,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-31 00:44:05,203 [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-31 00:44:05,683 [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-31 00:44:06,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-31 00:44:06,597 [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-31 00:44:06,599 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-31 00:44:06,599 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:06,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-31 00:44:06,599 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:06,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:06,606 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:06,612 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:06,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:06,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:06,628 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:06,629 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-31 00:44:07,005 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-31 00:44:07,005 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-31 00:44:07,009 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:07,010 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:07,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:07,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-31 00:44:07,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:07,027 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-31 00:44:07,037 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:07,040 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-31 00:44:07,040 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-31 00:44:07,040 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-31 00:44:07,040 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-31 00:44:07,040 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-31 00:44:07,040 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-31 00:44:07,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:07,208 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:07,250 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:07,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:07,255 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:07,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:07,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb81aa4c0> has no local changes
2024-05-31 00:44:07,301 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:07,311 [ scc.git] DEBUG [detached HEAD b758552] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:07,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:07,311 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:07,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-31 00:44:08,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-31 00:44:08,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-31 00:44:09,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-31 00:44:09,659 [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-31 00:44:10,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-31 00:44:10,610 [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-31 00:44:10,611 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-31 00:44:11,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-31 00:44:11,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-31 00:44:11,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-31 00:44:12,424 [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-31 00:44:12,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-31 00:44:13,284 [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-31 00:44:13,285 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-31 00:44:13,285 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:13,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-31 00:44:13,285 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:13,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:13,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:13,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:13,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:13,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:13,307 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:13,307 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-31 00:44:13,675 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-31 00:44:13,676 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-31 00:44:13,680 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-31 00:44:14,231 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-31 00:44:14,231 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-31 00:44:14,235 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:14,235 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:14,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:14,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-31 00:44:14,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:14,252 [ 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-31 00:44:14,266 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-31 00:44:14,266 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-31 00:44:14,266 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-31 00:44:14,266 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-31 00:44:14,266 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:44:14,267 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:44:14,273 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-31 00:44:14,279 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-31 00:44:14,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:14,448 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-31 00:44:14,455 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-31 00:44:14,460 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-31 00:44:14,465 [ scc.config] DEBUG Found github.token
2024-05-31 00:44:14,465 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-31 00:44:14,465 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-31 00:44:14,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:14,477 [ 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-31 00:44:14,555 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-31 00:44:14,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-31 00:44:14,555 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-31 00:44:14,555 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:44:14,556 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:44:14,563 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-31 00:44:14,571 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-31 00:44:14,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:14,853 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-31 00:44:14,860 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-31 00:44:14,866 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/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-31 00:44:14,871 [ scc.config] DEBUG Found github.token
2024-05-31 00:44:14,871 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-31 00:44:14,871 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:14,909 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:14,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:14,914 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:14,951 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:14,958 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb8151700> has no local changes
2024-05-31 00:44:14,959 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:14,967 [ scc.git] DEBUG [detached HEAD d198d1e] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:14,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:14,967 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:15,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-31 00:44:15,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-31 00:44:15,959 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-31 00:44:16,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-31 00:44:16,936 [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-31 00:44:17,398 [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-31 00:44:17,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-31 00:44:18,264 [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-31 00:44:18,265 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-31 00:44:18,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-31 00:44:18,741 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-31 00:44:19,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-31 00:44:19,690 [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-31 00:44:20,186 [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-31 00:44:20,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-31 00:44:21,156 [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-31 00:44:21,157 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-31 00:44:21,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-31 00:44:21,604 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-31 00:44:22,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-31 00:44:22,551 [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-31 00:44:23,035 [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-31 00:44:23,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-31 00:44:23,988 [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-31 00:44:23,988 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-31 00:44:24,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-31 00:44:24,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-31 00:44:25,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-31 00:44:26,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-31 00:44:26,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-31 00:44:27,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-31 00:44:27,080 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:27,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-31 00:44:27,080 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:27,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:27,086 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:27,090 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:27,090 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:27,095 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:27,100 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:27,100 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-31 00:44:27,463 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-31 00:44:27,463 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-31 00:44:27,468 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-31 00:44:27,839 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-31 00:44:27,839 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-31 00:44:27,843 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-31 00:44:28,212 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-31 00:44:28,213 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-31 00:44:28,217 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:28,217 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:28,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:28,223 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-31 00:44:28,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:28,233 [ 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-31 00:44:28,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:28,244 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-31 00:44:28,244 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-31 00:44:28,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:28,418 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-31 00:44:28,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:28,431 [ 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-31 00:44:28,445 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-31 00:44:28,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:28,449 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-31 00:44:28,449 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-31 00:44:28,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:28,841 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-31 00:44:28,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:28,856 [ 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-31 00:44:28,868 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-31 00:44:28,868 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:28,871 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-31 00:44:28,871 [ scc.git] DEBUG package.json | 2 +-
2024-05-31 00:44:28,871 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-31 00:44:29,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:29,283 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:29,322 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:29,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:29,327 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:29,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:29,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb81515b0> has no local changes
2024-05-31 00:44:29,377 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:29,385 [ scc.git] DEBUG [detached HEAD 9252458] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:29,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:29,385 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:29,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-31 00:44:30,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-31 00:44:30,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-31 00:44:31,169 [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-31 00:44:31,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-31 00:44:32,034 [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-31 00:44:32,034 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-31 00:44:32,034 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:32,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-31 00:44:32,035 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:32,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:32,043 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:32,049 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:32,049 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:32,055 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:32,073 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:32,073 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-31 00:44:32,445 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-31 00:44:32,445 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-31 00:44:32,449 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:32,449 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:32,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:32,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-31 00:44:32,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:32,464 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-31 00:44:32,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:32,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:32,637 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:32,707 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:32,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:32,716 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:32,768 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:32,777 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb8163bb0> has no local changes
2024-05-31 00:44:32,777 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:32,790 [ scc.git] DEBUG [detached HEAD 8d762e6] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:32,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:32,791 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:33,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-31 00:44:33,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-31 00:44:34,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-31 00:44:34,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-31 00:44:35,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-31 00:44:35,478 [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-31 00:44:35,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-31 00:44:36,333 [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-31 00:44:36,334 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-31 00:44:36,334 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:36,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-31 00:44:36,334 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:36,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:36,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:36,349 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:36,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:36,365 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:36,381 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:36,381 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-31 00:44:36,871 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-31 00:44:36,871 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-31 00:44:36,877 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:36,877 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:36,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:36,882 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-31 00:44:36,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:36,892 [ 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-31 00:44:36,901 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-31 00:44:36,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:36,904 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-31 00:44:36,904 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-31 00:44:37,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:37,073 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:37,114 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:37,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:37,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:37,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:37,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb811a5e0> has no local changes
2024-05-31 00:44:37,167 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:37,176 [ scc.git] DEBUG [detached HEAD de608b4] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:37,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:37,176 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:37,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-31 00:44:38,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-31 00:44:38,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-31 00:44:38,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-31 00:44:39,403 [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-31 00:44:39,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-31 00:44:40,283 [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-31 00:44:40,283 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-31 00:44:40,284 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:40,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-31 00:44:40,284 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:40,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:40,290 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:40,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:40,295 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:40,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:40,305 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:40,305 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-31 00:44:40,685 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-31 00:44:40,686 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-31 00:44:40,690 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:40,690 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:40,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:40,696 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-31 00:44:40,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:40,712 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-31 00:44:40,797 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-31 00:44:40,797 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG Auto-merging setup.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-31 00:44:40,798 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:44:40,798 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:44:40,805 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-31 00:44:40,811 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-31 00:44:40,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:40,981 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-31 00:44:40,988 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-31 00:44:40,993 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2024-05-31 00:44:40,997 [ scc.config] DEBUG Found github.token
2024-05-31 00:44:40,998 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-31 00:44:40,998 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:41,037 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:41,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:41,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:41,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:41,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb81b8ee0> has no local changes
2024-05-31 00:44:41,089 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:41,096 [ scc.git] DEBUG [detached HEAD 16fa29a] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:41,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:41,097 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:41,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-31 00:44:41,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70 HTTP/1.1" 200 None
2024-05-31 00:44:42,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70/comments HTTP/1.1" 200 None
2024-05-31 00:44:42,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-31 00:44:43,314 [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-31 00:44:43,804 [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-31 00:44:44,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-31 00:44:44,667 [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-31 00:44:44,668 [ scc.repo] DEBUG - PR 70 jburel 'Toml support'
2024-05-31 00:44:45,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-31 00:44:45,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-31 00:44:46,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-31 00:44:46,557 [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-31 00:44:46,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-31 00:44:47,465 [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-31 00:44:47,465 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-31 00:44:47,465 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:47,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-31 00:44:47,466 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:47,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:47,472 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:47,477 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:47,477 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:47,483 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:47,488 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:47,489 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-31 00:44:47,963 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-31 00:44:47,963 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-31 00:44:47,970 [ scc.git] DEBUG Calling 'git fetch origin pull/70/head'
2024-05-31 00:44:48,343 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-31 00:44:48,343 [ scc.git] DEBUG * branch refs/pull/70/head -> FETCH_HEAD
2024-05-31 00:44:48,348 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:48,348 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:48,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:48,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-31 00:44:48,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:48,366 [ 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-31 00:44:48,421 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-31 00:44:48,425 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-31 00:44:48,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-31 00:44:48,428 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-31 00:44:48,428 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-31 00:44:48,428 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-31 00:44:48,428 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-31 00:44:48,429 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-31 00:44:48,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:48,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-31 00:44:48,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:48,606 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 70 (Toml support) 7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-31 00:44:48,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-31 00:44:48,660 [ scc.git] DEBUG py-setup | 3 +--
2024-05-31 00:44:48,660 [ scc.git] DEBUG utils | 18 ++++++++++++------
2024-05-31 00:44:48,661 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 8 deletions(-)
2024-05-31 00:44:49,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:49,012 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:49,057 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,062 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:49,103 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:49,111 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb811a7f0> has no local changes
2024-05-31 00:44:49,111 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:49,120 [ scc.git] DEBUG [detached HEAD 02978f2] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:49,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:49,121 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:49,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-31 00:44:49,434 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:49,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-31 00:44:49,434 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:49,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:49,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:49,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:49,459 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:49,460 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:49,460 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:49,508 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:49,557 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:49,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb812abe0> has no local changes
2024-05-31 00:44:49,564 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:49,573 [ scc.git] DEBUG [detached HEAD 0cfd5ef] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:49,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:49,574 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-31 00:44:49,878 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:49,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-31 00:44:49,878 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,884 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:49,890 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:49,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:49,896 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:49,902 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:49,902 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:49,902 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:49,955 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:49,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:49,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:50,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:50,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb8187e20> has no local changes
2024-05-31 00:44:50,009 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:50,018 [ scc.git] DEBUG [detached HEAD dc827b1] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:50,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:50,019 [ scc.git] INFO Overriding base-branch from master to main
2024-05-31 00:44:50,019 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:50,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-31 00:44:50,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-31 00:44:51,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-31 00:44:51,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-31 00:44:52,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-31 00:44:52,755 [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-31 00:44:53,215 [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-31 00:44:53,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-31 00:44:54,114 [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-31 00:44:54,115 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-31 00:44:54,115 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:54,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-31 00:44:54,115 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:54,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:54,122 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-31 00:44:54,127 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:54,127 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-31 00:44:54,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-31 00:44:54,138 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:54,138 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-31 00:44:54,517 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-31 00:44:54,517 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-31 00:44:54,521 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:54,521 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:54,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:54,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-31 00:44:54,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:54,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-31 00:44:54,601 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-31 00:44:54,602 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-31 00:44:54,602 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:44:54,602 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:44:54,609 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-31 00:44:54,616 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-31 00:44:54,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:54,781 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-31 00:44:54,788 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-31 00:44:54,795 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-31 00:44:54,803 [ scc.config] DEBUG Found github.token
2024-05-31 00:44:54,804 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-31 00:44:54,804 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:54,860 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:54,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:54,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:54,902 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:54,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb816ff40> has no local changes
2024-05-31 00:44:54,909 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:54,917 [ scc.git] DEBUG [detached HEAD 57ee07a] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:54,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:54,917 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:55,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-31 00:44:55,207 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:55,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-31 00:44:55,207 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,213 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:55,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:55,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:55,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:55,232 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:55,233 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:55,233 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,239 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:55,280 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:55,329 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:55,336 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb811dee0> has no local changes
2024-05-31 00:44:55,337 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:55,345 [ scc.git] DEBUG [detached HEAD 64ed362] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:55,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:55,346 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:55,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-31 00:44:55,651 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:55,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-31 00:44:55,651 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,660 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:55,666 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:55,666 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:55,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:55,684 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:55,685 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:55,685 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,692 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:55,740 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:55,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:55,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:55,788 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:55,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb80965b0> has no local changes
2024-05-31 00:44:55,795 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:55,804 [ scc.git] DEBUG [detached HEAD aebfc9c] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:55,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:55,804 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:44:56,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-31 00:44:56,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-31 00:44:57,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-31 00:44:57,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-31 00:44:57,915 [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-31 00:44:58,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-31 00:44:58,825 [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-31 00:44:58,825 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-31 00:44:58,825 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:44:58,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-31 00:44:58,826 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:58,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:58,832 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-31 00:44:58,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:44:58,838 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-31 00:44:58,843 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-31 00:44:58,850 [ scc.git] DEBUG Already up to date.
2024-05-31 00:44:58,850 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-31 00:44:59,238 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-31 00:44:59,238 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-31 00:44:59,243 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:44:59,244 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:59,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:59,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-31 00:44:59,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:59,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-31 00:44:59,314 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-31 00:44:59,314 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-31 00:44:59,314 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:44:59,315 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:44:59,324 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-31 00:44:59,334 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-31 00:44:59,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:44:59,491 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-31 00:44:59,497 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-31 00:44:59,504 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-31 00:44:59,511 [ scc.config] DEBUG Found github.token
2024-05-31 00:44:59,511 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-31 00:44:59,511 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:44:59,555 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:44:59,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:44:59,563 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:44:59,608 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:44:59,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb80dabb0> has no local changes
2024-05-31 00:44:59,618 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:44:59,629 [ scc.git] DEBUG [detached HEAD 833fc69] merge master -Dorg -Ssuccess-only
2024-05-31 00:44:59,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:44:59,630 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-31 00:44:59,630 [ scc.repo] DEBUG ## PRs found:
2024-05-31 00:45:00,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-31 00:45:00,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-31 00:45:01,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-31 00:45:01,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-31 00:45:02,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-31 00:45:02,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-31 00:45:02,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-31 00:45:03,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-31 00:45:03,878 [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-31 00:45:04,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-31 00:45:04,725 [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-31 00:45:04,726 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-31 00:45:05,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-31 00:45:05,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-31 00:45:06,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-31 00:45:06,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-31 00:45:06,687 [ scc.repo] DEBUG ## Branches found:
2024-05-31 00:45:06,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-31 00:45:06,687 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:45:06,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:45:06,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-31 00:45:06,706 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-31 00:45:06,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-31 00:45:06,716 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-31 00:45:06,727 [ scc.git] DEBUG Already up to date.
2024-05-31 00:45:06,727 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-31 00:45:07,127 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-31 00:45:07,127 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-31 00:45:07,131 [ scc.git] DEBUG ## Unique users: []
2024-05-31 00:45:07,132 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:45:07,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:45:07,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-31 00:45:07,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:45:07,153 [ 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-31 00:45:07,210 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-31 00:45:07,210 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-31 00:45:07,210 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-31 00:45:07,211 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-31 00:45:07,217 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-31 00:45:07,224 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-31 00:45:07,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:07,400 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-31 00:45:07,408 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-31 00:45:07,416 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-31 00:45:07,422 [ scc.config] DEBUG Found github.token
2024-05-31 00:45:07,422 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-31 00:45:07,423 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-31 00:45:07,467 [ scc.git] DEBUG Get sha1 of %s
2024-05-31 00:45:07,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-31 00:45:07,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:45:07,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:45:07,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfb8096280> has no local changes
2024-05-31 00:45:07,528 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:45:07,539 [ scc.git] DEBUG [detached HEAD 52fe60a] merge master -Dorg -Ssuccess-only
2024-05-31 00:45:07,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:07,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-31 00:45:07,631 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-31 00:45:07,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:07,820 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-31 00:45:07,825 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-31 00:45:08,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:08,277 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-31 00:45:08,283 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-31 00:45:08,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:08,697 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-31 00:45:08,703 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-31 00:45:09,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:09,125 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-31 00:45:09,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:09,536 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-31 00:45:09,542 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-31 00:45:09,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:09,946 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-31 00:45:09,952 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-31 00:45:10,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:10,370 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-31 00:45:10,375 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-31 00:45:10,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:10,790 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-31 00:45:10,795 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-31 00:45:11,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:11,203 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-31 00:45:11,208 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-31 00:45:11,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:11,620 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-31 00:45:11,628 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-31 00:45:12,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:12,063 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-31 00:45:12,069 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-31 00:45:12,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:12,475 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-31 00:45:12,484 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-31 00:45:12,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:12,908 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-31 00:45:13,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:13,330 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-31 00:45:13,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:13,733 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-31 00:45:13,738 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-31 00:45:14,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:14,156 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-31 00:45:14,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:14,578 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-31 00:45:14,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:14,985 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-31 00:45:14,991 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-31 00:45:15,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:15,412 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-31 00:45:15,417 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-31 00:45:15,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:15,845 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-31 00:45:15,851 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-31 00:45:16,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:16,278 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-31 00:45:16,284 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-31 00:45:16,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-31 00:45:16,688 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-31 00:45:16,689 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-31 00:45:16,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfba2fbd90> has local changes
2024-05-31 00:45:16,787 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/82/)'
2024-05-31 00:45:16,803 [ scc.git] DEBUG [detached HEAD 3b9685b] merge master -Dorg -Ssuccess-only
2024-05-31 00:45:16,803 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-31 00:45:16,804 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-31 00:45:16,804 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,804 [ scc.merge] INFO
2024-05-31 00:45:16,804 [ scc.merge] INFO
2024-05-31 00:45:16,804 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-31 00:45:16,804 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,804 [ scc.merge] INFO
2024-05-31 00:45:16,804 [ scc.merge] INFO
2024-05-31 00:45:16,804 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-31 00:45:16,804 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,804 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-31 00:45:16,804 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,804 [ scc.merge] INFO
2024-05-31 00:45:16,804 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,804 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-31 00:45:16,805 [ scc.merge] INFO
2024-05-31 00:45:16,805 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-31 00:45:16,805 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-31 00:45:16,805 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,805 [ scc.merge] INFO
2024-05-31 00:45:16,805 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-05-31 00:45:16,805 [ scc.merge] INFO
2024-05-31 00:45:16,805 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-31 00:45:16,805 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,805 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-31 00:45:16,806 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,806 [ scc.merge] INFO
2024-05-31 00:45:16,806 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-31 00:45:16,806 [ scc.merge] INFO
2024-05-31 00:45:16,806 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-31 00:45:16,806 [ scc.merge] INFO
2024-05-31 00:45:16,806 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-31 00:45:16,806 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-31 00:45:16,806 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,806 [ scc.merge] INFO
2024-05-31 00:45:16,806 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,806 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-31 00:45:16,807 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-31 00:45:16,807 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-31 00:45:16,807 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-31 00:45:16,807 [ scc.merge] INFO
2024-05-31 00:45:16,807 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-31 00:45:16,807 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,807 [ scc.merge] INFO
2024-05-31 00:45:16,807 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,807 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-31 00:45:16,807 [ scc.merge] INFO
2024-05-31 00:45:16,807 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-31 00:45:16,807 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,807 [ scc.merge] INFO
2024-05-31 00:45:16,807 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,807 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-31 00:45:16,807 [ scc.merge] INFO
2024-05-31 00:45:16,807 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-31 00:45:16,808 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-31 00:45:16,808 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,808 [ scc.merge] INFO
2024-05-31 00:45:16,808 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-31 00:45:16,808 [ scc.merge] INFO
2024-05-31 00:45:16,808 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-31 00:45:16,808 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-31 00:45:16,808 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,808 [ scc.merge] INFO
2024-05-31 00:45:16,808 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,808 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-31 00:45:16,809 [ scc.merge] INFO
2024-05-31 00:45:16,809 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-31 00:45:16,809 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,809 [ scc.merge] INFO
2024-05-31 00:45:16,809 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-31 00:45:16,809 [ scc.merge] INFO
2024-05-31 00:45:16,809 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-31 00:45:16,809 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-31 00:45:16,809 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,809 [ scc.merge] INFO
2024-05-31 00:45:16,809 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,809 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-31 00:45:16,810 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-31 00:45:16,810 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-31 00:45:16,810 [ scc.merge] INFO
2024-05-31 00:45:16,810 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-31 00:45:16,810 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,810 [ scc.merge] INFO
2024-05-31 00:45:16,810 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,810 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-31 00:45:16,810 [ scc.merge] INFO
2024-05-31 00:45:16,810 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-31 00:45:16,810 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,810 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-31 00:45:16,810 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,810 [ scc.merge] INFO
2024-05-31 00:45:16,810 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,810 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-31 00:45:16,810 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-31 00:45:16,811 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,811 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-31 00:45:16,811 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Merged PRs:
2024-05-31 00:45:16,811 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-31 00:45:16,811 [ scc.merge] INFO - PR 70 jburel 'Toml support'
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-31 00:45:16,811 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO
2024-05-31 00:45:16,811 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-31 00:45:16,812 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-31 00:45:16,812 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,812 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-31 00:45:16,812 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,812 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-31 00:45:16,812 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO
2024-05-31 00:45:16,812 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-31 00:45:16,813 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,813 [ scc.merge] INFO
2024-05-31 00:45:16,813 [ scc.merge] INFO
2024-05-31 00:45:16,813 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-31 00:45:16,813 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,813 [ scc.merge] INFO
2024-05-31 00:45:16,813 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,813 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-31 00:45:16,813 [ scc.merge] INFO
2024-05-31 00:45:16,813 [ scc.merge] INFO Repository: ome/scripts
2024-05-31 00:45:16,813 [ scc.merge] INFO Excluded PRs:
2024-05-31 00:45:16,813 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-31 00:45:16,813 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-31 00:45:16,813 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-31 00:45:16,813 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-31 00:45:16,813 [ scc.merge] INFO Already up to date.
2024-05-31 00:45:16,813 [ scc.merge] INFO
2024-05-31 00:45:16,814 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-31 00:45:16,814 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-31 00:45:16,814 [ scc.merge] INFO
2024-05-31 00:45:16,814 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-31 00:45:16,814 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-31 00:45:16,822 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-31 00:45:16,830 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-31 00:45:16,839 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-31 00:45:16,847 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-31 00:45:16,853 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-31 00:45:16,859 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-31 00:45:16,865 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-31 00:45:16,871 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-31 00:45:16,877 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-31 00:45:16,884 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-31 00:45:16,891 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-31 00:45:16,897 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-31 00:45:16,903 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-31 00:45:16,908 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-31 00:45:16,914 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-31 00:45:16,920 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-31 00:45:16,926 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-31 00:45:16,932 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-31 00:45:16,940 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-31 00:45:16,946 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-31 00:45:16,953 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-31 00:45:16,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-31 00:45:16,959 [ scc.git] DEBUG Calling 'git remote'
2024-05-31 00:45:16,966 [ 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 e5a7f2d] 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 e2e3290] 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-31 00:46:08,098 [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-31 00:46:17,016 [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-31 00:46:19,406 [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-31 00:46:23,982 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-31 00:47:11,342 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci