Console Output
Skipping 79 KB..
Full Log017ef8d4d4ac39473'
2024-05-22 03:13:10,106 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-22 03:13:10,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:10,437 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-22 03:13:10,444 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-22 03:13:10,450 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-05-22 03:13:10,454 [ scc.config] DEBUG Found github.token
2024-05-22 03:13:10,454 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-22 03:13:10,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-22 03:13:10,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:10,464 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-22 03:13:10,477 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-22 03:13:10,477 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-22 03:13:10,477 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:10,480 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-22 03:13:10,480 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-22 03:13:10,480 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-22 03:13:10,480 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-22 03:13:10,480 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-22 03:13:10,480 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-22 03:13:10,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:10,851 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:10,894 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:10,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:10,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:10,942 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:10,949 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b17a640> has no local changes
2024-05-22 03:13:10,949 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:10,958 [ scc.git] DEBUG [detached HEAD 782f6cf] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:10,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:10,959 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:11,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-22 03:13:11,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-22 03:13:12,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-22 03:13:12,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-22 03:13:13,370 [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-22 03:13:13,852 [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-22 03:13:14,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-22 03:13:14,765 [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-22 03:13:14,770 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-22 03:13:15,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-22 03:13:15,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-22 03:13:16,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-22 03:13:16,668 [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-22 03:13:17,118 [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-22 03:13:17,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-22 03:13:18,047 [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-22 03:13:18,048 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-22 03:13:18,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-22 03:13:18,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-22 03:13:19,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-22 03:13:19,950 [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-22 03:13:20,443 [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-22 03:13:21,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-22 03:13:21,422 [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-22 03:13:21,423 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-22 03:13:21,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-22 03:13:22,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-22 03:13:22,875 [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-22 03:13:23,323 [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-22 03:13:23,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-22 03:13:24,231 [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-22 03:13:24,232 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-22 03:13:24,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-22 03:13:25,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-22 03:13:25,181 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:13:25,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-22 03:13:25,181 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:25,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:25,186 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:13:25,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:13:25,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:13:25,196 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:13:25,202 [ scc.git] DEBUG Already up to date.
2024-05-22 03:13:25,202 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-22 03:13:26,073 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-22 03:13:26,073 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-22 03:13:26,079 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-22 03:13:26,643 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-22 03:13:26,643 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-22 03:13:26,648 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-22 03:13:27,621 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-22 03:13:27,621 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-22 03:13:27,624 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-22 03:13:28,008 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-22 03:13:28,008 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-22 03:13:28,014 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:13:28,014 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:28,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:28,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-22 03:13:28,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:28,031 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-22 03:13:28,104 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-22 03:13:28,110 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-22 03:13:28,110 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-22 03:13:28,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:28,274 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-22 03:13:28,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:28,285 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-22 03:13:28,316 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-22 03:13:28,316 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-22 03:13:28,316 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-22 03:13:28,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:28,323 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-22 03:13:28,323 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-22 03:13:28,323 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-22 03:13:28,323 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-22 03:13:28,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:28,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-22 03:13:28,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:28,725 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-22 03:13:28,942 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-22 03:13:28,943 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-22 03:13:28,943 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-22 03:13:28,943 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-22 03:13:28,943 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-22 03:13:28,943 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:28,951 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-22 03:13:28,951 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-22 03:13:28,951 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/index.html | 1 +
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-22 03:13:28,951 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-22 03:13:28,953 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-22 03:13:28,953 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-22 03:13:28,953 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-22 03:13:29,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:29,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-22 03:13:29,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:29,129 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-22 03:13:29,146 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:29,148 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-22 03:13:29,149 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-22 03:13:29,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:29,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:29,578 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:29,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:29,584 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:29,623 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:29,631 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b1c1be0> has no local changes
2024-05-22 03:13:29,631 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:29,643 [ scc.git] DEBUG [detached HEAD 0a585c6e] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:29,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:29,644 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:30,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-22 03:13:30,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-22 03:13:31,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-22 03:13:31,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-22 03:13:32,011 [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-22 03:13:32,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-22 03:13:32,957 [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-22 03:13:32,958 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-22 03:13:32,958 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:13:32,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-22 03:13:32,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:32,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:32,964 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:13:32,969 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:13:32,970 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:13:32,976 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:13:32,982 [ scc.git] DEBUG Already up to date.
2024-05-22 03:13:32,982 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-22 03:13:33,402 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-22 03:13:33,402 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-22 03:13:33,406 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:13:33,406 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:33,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:33,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-22 03:13:33,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:33,424 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-22 03:13:33,448 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-22 03:13:33,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:33,451 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-22 03:13:33,451 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-22 03:13:33,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:33,626 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:33,667 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:33,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:33,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:33,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:33,719 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27e5c9430> has no local changes
2024-05-22 03:13:33,719 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:33,727 [ scc.git] DEBUG [detached HEAD 741ae0a] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:33,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:33,728 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:34,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-22 03:13:34,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-22 03:13:34,631 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-22 03:13:35,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-22 03:13:35,694 [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-22 03:13:36,189 [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-22 03:13:36,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-22 03:13:37,084 [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-22 03:13:37,085 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-22 03:13:37,085 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:13:37,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-22 03:13:37,085 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:37,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:37,090 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:13:37,095 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:13:37,095 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:13:37,099 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:13:37,105 [ scc.git] DEBUG Already up to date.
2024-05-22 03:13:37,106 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-22 03:13:37,486 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-22 03:13:37,486 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-22 03:13:37,490 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:13:37,491 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:37,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:37,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-22 03:13:37,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:37,506 [ 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-22 03:13:37,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:37,520 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-22 03:13:37,520 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-22 03:13:37,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:37,685 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:37,723 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:37,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:37,728 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:37,766 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:37,774 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b1d9bb0> has no local changes
2024-05-22 03:13:37,774 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:37,784 [ scc.git] DEBUG [detached HEAD 85188b6] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:37,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:37,785 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:38,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-22 03:13:38,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-22 03:13:39,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-22 03:13:39,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-22 03:13:40,186 [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-22 03:13:40,699 [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-22 03:13:41,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-22 03:13:41,610 [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-22 03:13:41,612 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-22 03:13:42,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-22 03:13:42,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-22 03:13:43,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-22 03:13:43,574 [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-22 03:13:44,047 [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-22 03:13:44,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-22 03:13:44,967 [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-22 03:13:44,968 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-22 03:13:45,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-22 03:13:45,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-22 03:13:46,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-22 03:13:47,436 [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-22 03:13:47,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-22 03:13:48,305 [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-22 03:13:48,305 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-22 03:13:48,306 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:13:48,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-22 03:13:48,306 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:48,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:48,312 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:13:48,317 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:13:48,317 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:13:48,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:13:48,329 [ scc.git] DEBUG Already up to date.
2024-05-22 03:13:48,329 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-22 03:13:48,747 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-22 03:13:48,747 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-22 03:13:48,752 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-22 03:13:49,789 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-22 03:13:49,789 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-22 03:13:49,794 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-22 03:13:50,300 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-22 03:13:50,300 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-22 03:13:50,305 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:13:50,306 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:50,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:50,311 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-22 03:13:50,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:50,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-22 03:13:50,348 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-22 03:13:50,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:50,352 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-22 03:13:50,352 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-22 03:13:50,352 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-22 03:13:50,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:50,517 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-22 03:13:50,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:50,529 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-22 03:13:50,594 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-22 03:13:50,594 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-22 03:13:50,594 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-22 03:13:50,594 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-22 03:13:50,595 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:50,599 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-22 03:13:50,599 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-22 03:13:50,599 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-22 03:13:50,599 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-22 03:13:50,599 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-22 03:13:50,599 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-22 03:13:50,599 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-22 03:13:50,599 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-22 03:13:50,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:50,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-22 03:13:50,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:50,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-22 03:13:50,984 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-22 03:13:50,985 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:50,988 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-22 03:13:50,988 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-22 03:13:50,988 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-22 03:13:51,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:51,346 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:51,389 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:51,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:51,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:51,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:51,441 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2781315b0> has no local changes
2024-05-22 03:13:51,441 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:51,452 [ scc.git] DEBUG [detached HEAD 4707a07] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:51,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:51,456 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:51,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-22 03:13:52,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-22 03:13:52,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-22 03:13:53,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-22 03:13:53,843 [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-22 03:13:54,304 [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-22 03:13:54,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-22 03:13:55,178 [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-22 03:13:55,179 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-22 03:13:55,179 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:13:55,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-22 03:13:55,179 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:55,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:55,186 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:13:55,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:13:55,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:13:55,196 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:13:55,201 [ scc.git] DEBUG Already up to date.
2024-05-22 03:13:55,201 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-22 03:13:55,582 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-22 03:13:55,582 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-22 03:13:55,587 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:13:55,587 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:55,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:55,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-22 03:13:55,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:55,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-22 03:13:55,612 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:13:55,615 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-22 03:13:55,615 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-22 03:13:55,615 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-22 03:13:55,615 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-22 03:13:55,615 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-22 03:13:55,615 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-22 03:13:55,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:13:55,775 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:13:55,813 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:13:55,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:13:55,818 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:13:55,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:13:55,870 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb278131550> has no local changes
2024-05-22 03:13:55,870 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:13:55,883 [ scc.git] DEBUG [detached HEAD c4c8a9b] merge master -Dorg -Ssuccess-only
2024-05-22 03:13:55,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:13:55,884 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:13:56,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-22 03:13:56,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-22 03:13:57,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-22 03:13:57,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-22 03:13:58,307 [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-22 03:13:58,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-22 03:13:59,223 [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-22 03:13:59,224 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-22 03:13:59,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-22 03:14:00,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-22 03:14:00,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-22 03:14:01,143 [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-22 03:14:01,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-22 03:14:02,057 [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-22 03:14:02,058 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-22 03:14:02,058 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:02,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-22 03:14:02,058 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:02,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:02,063 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:02,068 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:02,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:02,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:02,079 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:02,079 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-22 03:14:02,624 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-22 03:14:02,625 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-22 03:14:02,630 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-22 03:14:03,467 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-22 03:14:03,467 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-22 03:14:03,473 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:03,473 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:03,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:03,479 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-22 03:14:03,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:03,492 [ 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-22 03:14:03,590 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-22 03:14:03,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-22 03:14:03,591 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-22 03:14:03,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-22 03:14:03,591 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:03,591 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:03,597 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-22 03:14:03,604 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-22 03:14:03,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:03,779 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-22 03:14:03,786 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-22 03:14:03,793 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-22 03:14:03,798 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:03,799 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-22 03:14:03,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-22 03:14:03,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:03,810 [ 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-22 03:14:03,842 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-22 03:14:03,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-22 03:14:03,842 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-22 03:14:03,842 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:03,843 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:03,848 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-22 03:14:03,856 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-22 03:14:04,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:04,195 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-22 03:14:04,205 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-22 03:14:04,211 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/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-22 03:14:04,216 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:04,216 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-22 03:14:04,216 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:04,253 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:04,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:04,258 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:04,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:04,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb278141d00> has no local changes
2024-05-22 03:14:04,301 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:04,308 [ scc.git] DEBUG [detached HEAD be90e23] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:04,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:04,309 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:04,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-22 03:14:05,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-22 03:14:05,197 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-22 03:14:05,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-22 03:14:06,270 [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-22 03:14:06,761 [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-22 03:14:07,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-22 03:14:07,697 [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-22 03:14:07,698 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-22 03:14:08,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-22 03:14:08,172 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-22 03:14:08,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-22 03:14:09,220 [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-22 03:14:09,701 [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-22 03:14:10,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-22 03:14:10,702 [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-22 03:14:10,703 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-22 03:14:11,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-22 03:14:11,184 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-22 03:14:11,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-22 03:14:12,256 [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-22 03:14:12,771 [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-22 03:14:13,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-22 03:14:13,799 [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-22 03:14:13,799 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-22 03:14:14,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-22 03:14:14,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-22 03:14:15,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-22 03:14:15,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-22 03:14:16,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-22 03:14:16,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-22 03:14:16,668 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:16,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-22 03:14:16,668 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:16,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:16,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:16,680 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:16,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:16,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:16,692 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:16,692 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-22 03:14:17,057 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-22 03:14:17,057 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-22 03:14:17,061 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-22 03:14:17,437 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-22 03:14:17,437 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-22 03:14:17,442 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-22 03:14:17,820 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-22 03:14:17,820 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-22 03:14:17,825 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:17,825 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:17,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:17,831 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-22 03:14:17,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:17,841 [ 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-22 03:14:17,851 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:17,854 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-22 03:14:17,854 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-22 03:14:18,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:18,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-22 03:14:18,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:18,023 [ 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-22 03:14:18,046 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-22 03:14:18,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:18,050 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-22 03:14:18,050 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-22 03:14:18,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:18,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-22 03:14:18,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:18,456 [ 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-22 03:14:18,466 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-22 03:14:18,467 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:18,470 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-22 03:14:18,470 [ scc.git] DEBUG package.json | 2 +-
2024-05-22 03:14:18,470 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-22 03:14:18,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:18,849 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:18,888 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:18,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:18,893 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:18,936 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:18,947 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b15ddf0> has no local changes
2024-05-22 03:14:18,948 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:18,957 [ scc.git] DEBUG [detached HEAD 118ebd0] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:18,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:18,957 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:19,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-22 03:14:19,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-22 03:14:20,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-22 03:14:20,855 [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-22 03:14:21,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-22 03:14:21,771 [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-22 03:14:21,772 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-22 03:14:21,773 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:21,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-22 03:14:21,773 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:21,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:21,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:21,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:21,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:21,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:21,794 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:21,794 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-22 03:14:22,166 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-22 03:14:22,167 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-22 03:14:22,171 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:22,171 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:22,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:22,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-22 03:14:22,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:22,188 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-22 03:14:22,196 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:22,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:22,359 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:22,398 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:22,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:22,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:22,443 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:22,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2780f51c0> has no local changes
2024-05-22 03:14:22,449 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:22,457 [ scc.git] DEBUG [detached HEAD 2142957] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:22,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:22,457 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:22,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-22 03:14:23,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-22 03:14:23,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-22 03:14:24,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-22 03:14:24,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-22 03:14:25,330 [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-22 03:14:25,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-22 03:14:26,201 [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-22 03:14:26,202 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-22 03:14:26,202 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:26,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-22 03:14:26,202 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:26,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:26,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:26,212 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:26,212 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:26,217 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:26,222 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:26,222 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-22 03:14:26,695 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-22 03:14:26,696 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-22 03:14:26,700 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:26,700 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:26,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:26,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-22 03:14:26,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:26,715 [ 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-22 03:14:26,724 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-22 03:14:26,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:26,727 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-22 03:14:26,727 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-22 03:14:26,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:26,889 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:26,927 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:26,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:26,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:26,972 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:26,979 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b176fa0> has no local changes
2024-05-22 03:14:26,979 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:26,987 [ scc.git] DEBUG [detached HEAD 70f6aa6] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:26,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:26,987 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:27,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-22 03:14:27,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-22 03:14:28,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-22 03:14:28,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-22 03:14:29,393 [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-22 03:14:29,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-22 03:14:30,384 [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-22 03:14:30,385 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-22 03:14:30,385 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:30,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-22 03:14:30,385 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:30,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:30,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:30,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:30,395 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:30,400 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:30,407 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:30,407 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-22 03:14:30,814 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-22 03:14:30,814 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-22 03:14:30,819 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:30,819 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:30,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:30,825 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-22 03:14:30,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:30,835 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-22 03:14:30,865 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG Auto-merging setup.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-22 03:14:30,865 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:30,866 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:30,872 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-22 03:14:30,879 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-22 03:14:31,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:31,037 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-22 03:14:31,044 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-22 03:14:31,050 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-05-22 03:14:31,055 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:31,055 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-22 03:14:31,055 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:31,095 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:31,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:31,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:31,135 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:31,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27b1d9d60> has no local changes
2024-05-22 03:14:31,142 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:31,149 [ scc.git] DEBUG [detached HEAD 77ee9ed] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:31,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:31,150 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:31,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-22 03:14:32,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-22 03:14:32,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-22 03:14:33,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-22 03:14:33,472 [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-22 03:14:33,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-22 03:14:34,428 [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-22 03:14:34,429 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-22 03:14:34,429 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:34,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-22 03:14:34,429 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:34,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:34,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:34,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:34,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:34,447 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:34,452 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:34,453 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-22 03:14:34,889 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-22 03:14:34,889 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-22 03:14:34,895 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:34,895 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:34,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:34,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-22 03:14:34,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:34,912 [ 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-22 03:14:34,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-22 03:14:34,927 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-22 03:14:34,929 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-22 03:14:34,930 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-22 03:14:34,930 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-22 03:14:34,930 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-22 03:14:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:35,082 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:35,124 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,130 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:35,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:35,174 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb278152eb0> has no local changes
2024-05-22 03:14:35,174 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:35,183 [ scc.git] DEBUG [detached HEAD 0691d89] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:35,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:35,183 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:35,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-22 03:14:35,509 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:35,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-22 03:14:35,510 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,515 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:35,519 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:35,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:35,524 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:35,529 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:35,529 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:35,529 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,534 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:35,586 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,591 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:35,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:35,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27810b4c0> has no local changes
2024-05-22 03:14:35,638 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:35,650 [ scc.git] DEBUG [detached HEAD 14e9353] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:35,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:35,651 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:35,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-22 03:14:35,946 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:35,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-22 03:14:35,946 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:35,958 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:35,958 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:35,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:35,969 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:35,969 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:35,969 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:35,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:35,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:36,012 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:36,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:36,017 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:36,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:36,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2780e6b80> has no local changes
2024-05-22 03:14:36,063 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:36,072 [ scc.git] DEBUG [detached HEAD 5aeeec3] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:36,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:36,073 [ scc.git] INFO Overriding base-branch from master to main
2024-05-22 03:14:36,073 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:36,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-22 03:14:36,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-22 03:14:37,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-22 03:14:37,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-22 03:14:38,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-22 03:14:38,919 [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-22 03:14:39,411 [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-22 03:14:39,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-22 03:14:40,347 [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-22 03:14:40,348 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-22 03:14:40,348 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:40,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-22 03:14:40,349 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:40,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:40,356 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-22 03:14:40,362 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:40,362 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-22 03:14:40,369 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-22 03:14:40,377 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:40,378 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-22 03:14:40,796 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-22 03:14:40,796 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-22 03:14:40,801 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:40,801 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:40,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:40,808 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-22 03:14:40,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:40,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-22 03:14:40,853 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-22 03:14:40,853 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-22 03:14:40,854 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:40,854 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:40,861 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-22 03:14:40,870 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-22 03:14:41,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:41,038 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-22 03:14:41,045 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-22 03:14:41,053 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-22 03:14:41,060 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:41,060 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-22 03:14:41,060 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:41,108 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:41,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:41,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2780d9e50> has no local changes
2024-05-22 03:14:41,170 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:41,181 [ scc.git] DEBUG [detached HEAD 522f6a1] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:41,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:41,182 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:41,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-22 03:14:41,483 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:41,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-22 03:14:41,484 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,490 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:41,497 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:41,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:41,506 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:41,515 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:41,516 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:41,516 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,523 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:41,571 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,577 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:41,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:41,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb278073f70> has no local changes
2024-05-22 03:14:41,637 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:41,648 [ scc.git] DEBUG [detached HEAD 191292b] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:41,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:41,649 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:41,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-22 03:14:41,933 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:41,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-22 03:14:41,934 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,943 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:41,950 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:41,950 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:41,959 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:41,966 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:41,967 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:41,967 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:41,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:41,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:42,028 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:42,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:42,036 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:42,081 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:42,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb278073640> has no local changes
2024-05-22 03:14:42,088 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:42,097 [ scc.git] DEBUG [detached HEAD 41c78c5] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:42,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:42,098 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:42,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-22 03:14:42,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-22 03:14:43,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-22 03:14:43,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-22 03:14:44,347 [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-22 03:14:44,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-22 03:14:45,275 [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-22 03:14:45,277 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-22 03:14:45,277 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:45,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-22 03:14:45,277 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:45,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:45,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-22 03:14:45,293 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:45,293 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-22 03:14:45,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-22 03:14:45,316 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:45,317 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-22 03:14:45,776 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-22 03:14:45,777 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-22 03:14:45,783 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:45,783 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:45,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:45,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-22 03:14:45,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:45,803 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-22 03:14:45,845 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-22 03:14:45,845 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-22 03:14:45,845 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:45,846 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:45,854 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-22 03:14:45,862 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-22 03:14:46,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:46,027 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-22 03:14:46,034 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-22 03:14:46,043 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-22 03:14:46,050 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:46,050 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-22 03:14:46,050 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:46,096 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:46,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:46,102 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:46,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:46,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2780679d0> has no local changes
2024-05-22 03:14:46,158 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:46,168 [ scc.git] DEBUG [detached HEAD ffa361d] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:46,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:46,169 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-22 03:14:46,169 [ scc.repo] DEBUG ## PRs found:
2024-05-22 03:14:46,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-22 03:14:47,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-22 03:14:47,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-22 03:14:48,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-22 03:14:48,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-22 03:14:48,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-22 03:14:49,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-22 03:14:49,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-22 03:14:50,358 [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-22 03:14:50,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-22 03:14:51,229 [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-22 03:14:51,231 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-22 03:14:51,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-22 03:14:52,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-22 03:14:52,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-22 03:14:53,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-22 03:14:53,234 [ scc.repo] DEBUG ## Branches found:
2024-05-22 03:14:53,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-22 03:14:53,234 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:53,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:53,240 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-22 03:14:53,244 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-22 03:14:53,245 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-22 03:14:53,250 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-22 03:14:53,256 [ scc.git] DEBUG Already up to date.
2024-05-22 03:14:53,256 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-22 03:14:53,665 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-22 03:14:53,665 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-22 03:14:53,670 [ scc.git] DEBUG ## Unique users: []
2024-05-22 03:14:53,671 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:53,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:53,677 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-22 03:14:53,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:53,689 [ 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-22 03:14:53,713 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-22 03:14:53,713 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-22 03:14:53,713 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-22 03:14:53,714 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-22 03:14:53,720 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-22 03:14:53,726 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-22 03:14:53,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:53,894 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-22 03:14:53,901 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-22 03:14:53,907 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#73](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-22 03:14:53,911 [ scc.config] DEBUG Found github.token
2024-05-22 03:14:53,912 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-22 03:14:53,912 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-22 03:14:53,949 [ scc.git] DEBUG Get sha1 of %s
2024-05-22 03:14:53,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-22 03:14:53,954 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:53,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:14:53,996 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2780d2970> has no local changes
2024-05-22 03:14:53,997 [ 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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:14:54,005 [ scc.git] DEBUG [detached HEAD 12bd2b2] merge master -Dorg -Ssuccess-only
2024-05-22 03:14:54,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:14:54,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-22 03:14:54,085 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-22 03:14:54,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:54,332 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-22 03:14:54,340 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-22 03:14:54,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:54,757 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-22 03:14:54,762 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-22 03:14:55,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:55,173 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-22 03:14:55,178 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-22 03:14:55,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:55,602 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-22 03:14:56,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:56,018 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-22 03:14:56,023 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-22 03:14:56,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:56,439 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-22 03:14:56,443 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-22 03:14:56,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:56,873 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-22 03:14:56,879 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-22 03:14:57,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:57,294 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-22 03:14:57,299 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-22 03:14:57,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:57,722 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-22 03:14:57,728 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-22 03:14:58,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:58,136 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-22 03:14:58,140 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-22 03:14:58,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:58,550 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-22 03:14:58,556 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-22 03:14:58,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:59,002 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-22 03:14:59,007 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-22 03:14:59,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:59,422 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-22 03:14:59,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:14:59,870 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-22 03:15:00,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:00,277 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-22 03:15:00,281 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-22 03:15:00,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:00,680 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-22 03:15:01,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:01,107 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-22 03:15:01,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:01,508 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-22 03:15:01,512 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-22 03:15:01,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:01,934 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-22 03:15:01,938 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-22 03:15:02,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:02,352 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-22 03:15:02,357 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-22 03:15:02,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:02,761 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-22 03:15:02,766 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-22 03:15:03,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-22 03:15:03,171 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-22 03:15:03,172 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-22 03:15:03,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb27e63a460> has local changes
2024-05-22 03:15:03,246 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 371 dependabot[bot] 'Bump omero-iviewer from `54c3753` to `7b7a637`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
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#73 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/73/)'
2024-05-22 03:15:03,260 [ scc.git] DEBUG [detached HEAD 84962a9] merge master -Dorg -Ssuccess-only
2024-05-22 03:15:03,260 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-22 03:15:03,260 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-22 03:15:03,260 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 371 dependabot[bot] 'Bump omero-iviewer from `54c3753` to `7b7a637`'
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-22 03:15:03,261 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-22 03:15:03,261 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-22 03:15:03,261 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-22 03:15:03,261 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-22 03:15:03,261 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-22 03:15:03,261 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-22 03:15:03,261 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,261 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,261 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-22 03:15:03,261 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-22 03:15:03,262 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-22 03:15:03,262 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-22 03:15:03,262 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-22 03:15:03,262 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-22 03:15:03,262 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-22 03:15:03,262 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-22 03:15:03,262 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-22 03:15:03,262 [ scc.merge] INFO
2024-05-22 03:15:03,262 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-22 03:15:03,263 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-22 03:15:03,263 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-22 03:15:03,263 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-22 03:15:03,263 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-22 03:15:03,263 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-22 03:15:03,263 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-22 03:15:03,263 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,263 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-22 03:15:03,263 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,263 [ scc.merge] INFO
2024-05-22 03:15:03,263 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,264 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,264 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Merged PRs:
2024-05-22 03:15:03,264 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-22 03:15:03,264 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,264 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,264 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-22 03:15:03,264 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO
2024-05-22 03:15:03,264 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-22 03:15:03,265 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,265 [ scc.merge] INFO
2024-05-22 03:15:03,265 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-22 03:15:03,265 [ scc.merge] INFO
2024-05-22 03:15:03,265 [ scc.merge] INFO Repository: ome/scripts
2024-05-22 03:15:03,265 [ scc.merge] INFO Excluded PRs:
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-22 03:15:03,265 [ scc.merge] INFO Already up to date.
2024-05-22 03:15:03,265 [ scc.merge] INFO
2024-05-22 03:15:03,265 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-22 03:15:03,265 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-22 03:15:03,265 [ scc.merge] INFO
2024-05-22 03:15:03,265 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-22 03:15:03,265 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-22 03:15:03,270 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-22 03:15:03,275 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-22 03:15:03,280 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-22 03:15:03,284 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-22 03:15:03,289 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-22 03:15:03,293 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-22 03:15:03,298 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-22 03:15:03,302 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-22 03:15:03,307 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-22 03:15:03,311 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-22 03:15:03,316 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-22 03:15:03,320 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-22 03:15:03,325 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-22 03:15:03,329 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-22 03:15:03,334 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-22 03:15:03,338 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-22 03:15:03,343 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-22 03:15:03,347 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-22 03:15:03,352 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-22 03:15:03,356 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-22 03:15:03,361 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-22 03:15:03,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-22 03:15:03,365 [ scc.git] DEBUG Calling 'git remote'
2024-05-22 03:15:03,369 [ 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 64d676d] 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 a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 27a76d0] 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-22 03:15:49,464 [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-22 03:15:58,475 [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-22 03:16:00,864 [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-22 03:16:05,506 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-22 03:16:53,575 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
