Console Output
Skipping 75 KB..
Full Logcc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:42:30,230 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:42:30,239 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-23 00:42:30,249 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-23 00:42:30,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:30,588 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-23 00:42:30,599 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-23 00:42:30,610 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/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-23 00:42:30,619 [ scc.config] DEBUG Found github.token
2024-05-23 00:42:30,619 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-23 00:42:30,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-23 00:42:30,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:30,643 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-23 00:42:30,662 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-23 00:42:30,662 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-23 00:42:30,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:30,667 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-23 00:42:30,667 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-23 00:42:30,667 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-23 00:42:30,667 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-23 00:42:30,667 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-23 00:42:30,667 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-23 00:42:30,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:30,999 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:42:31,052 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:31,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:31,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:42:31,112 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:42:31,120 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2eb640> has no local changes
2024-05-23 00:42:31,120 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:42:31,131 [ scc.git] DEBUG [detached HEAD 3a63c56] merge master -Dorg -Ssuccess-only
2024-05-23 00:42:31,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:42:31,132 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:42:31,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-23 00:42:31,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-23 00:42:32,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-23 00:42:32,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-23 00:42:33,423 [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-23 00:42:33,938 [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-23 00:42:34,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-23 00:42:34,859 [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-23 00:42:34,860 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-23 00:42:35,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-23 00:42:35,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-23 00:42:36,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-23 00:42:36,802 [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-23 00:42:37,287 [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-23 00:42:37,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-23 00:42:38,163 [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-23 00:42:38,165 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-23 00:42:38,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-23 00:42:39,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-23 00:42:39,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-23 00:42:40,035 [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-23 00:42:40,546 [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-23 00:42:40,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-23 00:42:41,399 [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-23 00:42:41,400 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-23 00:42:41,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-23 00:42:42,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-23 00:42:42,879 [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-23 00:42:43,375 [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-23 00:42:43,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-23 00:42:44,337 [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-23 00:42:44,340 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-23 00:42:44,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-23 00:42:45,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-23 00:42:45,277 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:42:45,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-23 00:42:45,277 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:45,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:45,285 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:42:45,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:42:45,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:42:45,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:42:45,310 [ scc.git] DEBUG Already up to date.
2024-05-23 00:42:45,310 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-23 00:42:46,438 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-23 00:42:46,439 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-23 00:42:46,444 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-23 00:42:46,974 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-23 00:42:46,974 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-23 00:42:46,979 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-23 00:42:47,794 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-23 00:42:47,794 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-23 00:42:47,800 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-23 00:42:48,210 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-23 00:42:48,210 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-23 00:42:48,216 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:42:48,216 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:48,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:48,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-23 00:42:48,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:48,238 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-23 00:42:48,389 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-23 00:42:48,396 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-23 00:42:48,396 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-23 00:42:48,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:48,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-23 00:42:48,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:48,575 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-23 00:42:48,724 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-23 00:42:48,724 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-23 00:42:48,724 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-23 00:42:48,725 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:48,731 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-23 00:42:48,732 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-23 00:42:48,732 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-23 00:42:48,732 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-23 00:42:48,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:48,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-23 00:42:48,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:48,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-23 00:42:49,253 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-23 00:42:49,253 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-23 00:42:49,253 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-23 00:42:49,253 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-23 00:42:49,253 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-23 00:42:49,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:49,262 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-23 00:42:49,262 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-23 00:42:49,262 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-23 00:42:49,263 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-23 00:42:49,268 [ scc.git] DEBUG src/index.html | 1 +
2024-05-23 00:42:49,271 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-23 00:42:49,271 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-23 00:42:49,272 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-23 00:42:49,272 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-23 00:42:49,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:49,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-23 00:42:49,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:49,443 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-23 00:42:49,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:49,474 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-23 00:42:49,474 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-23 00:42:49,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:49,831 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:42:49,874 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:49,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:49,880 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:42:49,921 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:42:49,931 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c337be0> has no local changes
2024-05-23 00:42:49,931 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:42:49,945 [ scc.git] DEBUG [detached HEAD 133aeb60] merge master -Dorg -Ssuccess-only
2024-05-23 00:42:49,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:42:49,946 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:42:50,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-23 00:42:50,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-23 00:42:51,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-23 00:42:51,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-23 00:42:52,242 [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-23 00:42:52,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-23 00:42:53,100 [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-23 00:42:53,101 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-23 00:42:53,101 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:42:53,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-23 00:42:53,101 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:53,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:53,108 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:42:53,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:42:53,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:42:53,121 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:42:53,128 [ scc.git] DEBUG Already up to date.
2024-05-23 00:42:53,128 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-23 00:42:53,523 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-23 00:42:53,523 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-23 00:42:53,530 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:42:53,530 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:53,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:53,539 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-23 00:42:53,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:53,553 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-23 00:42:53,586 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-23 00:42:53,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:53,590 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-23 00:42:53,590 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-23 00:42:53,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:53,741 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:42:53,805 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:53,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:53,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:42:53,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:42:53,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243f740e50> has no local changes
2024-05-23 00:42:53,869 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:42:53,879 [ scc.git] DEBUG [detached HEAD 54c9c4f] merge master -Dorg -Ssuccess-only
2024-05-23 00:42:53,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:42:53,880 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:42:54,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-23 00:42:54,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-23 00:42:54,715 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-23 00:42:55,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-23 00:42:55,774 [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-23 00:42:56,249 [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-23 00:42:56,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-23 00:42:57,246 [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-23 00:42:57,247 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-23 00:42:57,247 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:42:57,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-23 00:42:57,247 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:57,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:57,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:42:57,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:42:57,260 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:42:57,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:42:57,271 [ scc.git] DEBUG Already up to date.
2024-05-23 00:42:57,272 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-23 00:42:57,641 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-23 00:42:57,641 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-23 00:42:57,645 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:42:57,645 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:57,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:57,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-23 00:42:57,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:57,661 [ 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-23 00:42:57,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:42:57,676 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-23 00:42:57,677 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-23 00:42:57,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:42:57,838 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:42:57,876 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:42:57,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:42:57,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:42:57,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:42:57,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c34cbb0> has no local changes
2024-05-23 00:42:57,928 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:42:57,938 [ scc.git] DEBUG [detached HEAD b547e8b] merge master -Dorg -Ssuccess-only
2024-05-23 00:42:57,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:42:57,938 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:42:58,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-23 00:42:58,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-23 00:42:59,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-23 00:42:59,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-23 00:43:00,436 [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-23 00:43:00,907 [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-23 00:43:01,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-23 00:43:01,830 [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-23 00:43:01,832 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-23 00:43:02,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-23 00:43:02,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-23 00:43:03,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-23 00:43:03,893 [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-23 00:43:04,368 [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-23 00:43:04,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-23 00:43:05,303 [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-23 00:43:05,304 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-23 00:43:05,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-23 00:43:06,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-23 00:43:06,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-23 00:43:07,212 [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-23 00:43:07,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-23 00:43:08,152 [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-23 00:43:08,153 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-23 00:43:08,153 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:08,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-23 00:43:08,154 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:08,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:08,161 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:08,167 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:08,167 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:08,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:08,183 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:08,183 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-23 00:43:08,727 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-23 00:43:08,727 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-23 00:43:08,732 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-23 00:43:09,763 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-23 00:43:09,763 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-23 00:43:09,770 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-23 00:43:10,247 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-23 00:43:10,248 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-23 00:43:10,252 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:10,253 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:10,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:10,259 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-23 00:43:10,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:10,274 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-23 00:43:10,343 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-23 00:43:10,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:10,348 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-23 00:43:10,348 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-23 00:43:10,348 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-23 00:43:10,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:10,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-23 00:43:10,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:10,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-23 00:43:10,633 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-23 00:43:10,634 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-23 00:43:10,634 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-23 00:43:10,634 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-23 00:43:10,634 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:10,639 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-23 00:43:10,639 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-23 00:43:10,639 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-23 00:43:10,639 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-23 00:43:10,639 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-23 00:43:10,639 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-23 00:43:10,639 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-23 00:43:10,639 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-23 00:43:10,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:10,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-23 00:43:10,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:10,938 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-23 00:43:10,992 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-23 00:43:10,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:10,997 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-23 00:43:10,997 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-23 00:43:10,997 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-23 00:43:11,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:11,330 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:11,375 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:11,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:11,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:11,429 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:11,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2a75b0> has no local changes
2024-05-23 00:43:11,439 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:11,449 [ scc.git] DEBUG [detached HEAD 668957b] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:11,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:11,450 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:11,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-23 00:43:12,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-23 00:43:12,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-23 00:43:13,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-23 00:43:13,883 [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-23 00:43:14,392 [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-23 00:43:14,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-23 00:43:15,314 [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-23 00:43:15,315 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-23 00:43:15,315 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:15,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-23 00:43:15,316 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:15,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:15,323 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:15,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:15,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:15,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:15,343 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:15,343 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-23 00:43:15,719 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-23 00:43:15,719 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-23 00:43:15,725 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:15,725 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:15,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:15,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-23 00:43:15,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:15,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-23 00:43:15,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:15,761 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-23 00:43:15,761 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-23 00:43:15,761 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-23 00:43:15,761 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-23 00:43:15,761 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-23 00:43:15,761 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-23 00:43:15,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:15,930 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:15,973 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:15,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:15,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:16,027 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:16,034 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2a7550> has no local changes
2024-05-23 00:43:16,035 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:16,045 [ scc.git] DEBUG [detached HEAD c508283] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:16,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:16,046 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:16,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-23 00:43:16,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-23 00:43:17,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-23 00:43:18,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-23 00:43:18,493 [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-23 00:43:18,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-23 00:43:19,403 [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-23 00:43:19,403 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-23 00:43:19,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-23 00:43:20,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-23 00:43:20,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-23 00:43:21,299 [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-23 00:43:21,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-23 00:43:22,254 [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-23 00:43:22,255 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-23 00:43:22,255 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:22,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-23 00:43:22,256 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:22,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:22,264 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:22,271 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:22,271 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:22,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:22,287 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:22,287 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-23 00:43:23,011 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-23 00:43:23,011 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-23 00:43:23,016 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-23 00:43:23,575 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-23 00:43:23,576 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-23 00:43:23,580 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:23,580 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:23,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:23,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-23 00:43:23,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:23,603 [ 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-23 00:43:23,697 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-23 00:43:23,697 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-23 00:43:23,697 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-23 00:43:23,697 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-23 00:43:23,697 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:43:23,698 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:43:23,705 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-23 00:43:23,712 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-23 00:43:23,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:23,887 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-23 00:43:23,895 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-23 00:43:23,901 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-23 00:43:23,907 [ scc.config] DEBUG Found github.token
2024-05-23 00:43:23,907 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-23 00:43:23,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-23 00:43:23,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:23,921 [ 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-23 00:43:23,942 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-23 00:43:23,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-23 00:43:23,942 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-23 00:43:23,942 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:43:23,942 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:43:23,950 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-23 00:43:23,958 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-23 00:43:24,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:24,300 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-23 00:43:24,309 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-23 00:43:24,316 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/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-23 00:43:24,325 [ scc.config] DEBUG Found github.token
2024-05-23 00:43:24,325 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-23 00:43:24,326 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:24,378 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:24,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:24,386 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:24,428 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:24,436 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2b8d00> has no local changes
2024-05-23 00:43:24,436 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:24,447 [ scc.git] DEBUG [detached HEAD 4fd0e90] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:24,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:24,448 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:24,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-23 00:43:25,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-23 00:43:25,387 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-23 00:43:25,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-23 00:43:26,439 [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-23 00:43:26,956 [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-23 00:43:27,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-23 00:43:27,942 [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-23 00:43:27,943 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-23 00:43:28,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-23 00:43:28,400 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-23 00:43:28,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-23 00:43:29,503 [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-23 00:43:30,004 [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-23 00:43:30,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-23 00:43:30,953 [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-23 00:43:30,954 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-23 00:43:31,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-23 00:43:31,449 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-23 00:43:31,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-23 00:43:32,488 [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-23 00:43:33,008 [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-23 00:43:33,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-23 00:43:33,885 [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-23 00:43:33,886 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-23 00:43:34,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-23 00:43:34,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-23 00:43:35,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-23 00:43:35,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-23 00:43:36,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-23 00:43:36,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-23 00:43:36,770 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:36,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-23 00:43:36,770 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:36,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:36,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:36,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:36,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:36,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:36,797 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:36,798 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-23 00:43:37,166 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-23 00:43:37,166 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-23 00:43:37,172 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-23 00:43:37,581 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-23 00:43:37,581 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-23 00:43:37,587 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-23 00:43:37,979 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-23 00:43:37,980 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-23 00:43:37,986 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:37,986 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:37,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:37,992 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-23 00:43:37,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:38,006 [ 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-23 00:43:38,018 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:38,021 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-23 00:43:38,022 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-23 00:43:38,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:38,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-23 00:43:38,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:38,209 [ 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-23 00:43:38,254 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-23 00:43:38,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:38,259 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-23 00:43:38,259 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-23 00:43:38,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:38,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-23 00:43:38,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:38,622 [ 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-23 00:43:38,649 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-23 00:43:38,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:38,655 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-23 00:43:38,655 [ scc.git] DEBUG package.json | 2 +-
2024-05-23 00:43:38,655 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-23 00:43:39,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:39,013 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:39,064 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:39,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:39,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:39,120 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:39,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2e4df0> has no local changes
2024-05-23 00:43:39,135 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:39,149 [ scc.git] DEBUG [detached HEAD c9a34db] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:39,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:39,150 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:39,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-23 00:43:39,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-23 00:43:40,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-23 00:43:40,966 [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-23 00:43:41,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-23 00:43:41,893 [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-23 00:43:41,895 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-23 00:43:41,895 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:41,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-23 00:43:41,896 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:41,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:41,924 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:41,932 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:41,933 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:41,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:41,951 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:41,951 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-23 00:43:42,362 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-23 00:43:42,362 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-23 00:43:42,367 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:42,368 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:42,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:42,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-23 00:43:42,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:42,388 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-23 00:43:42,398 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:42,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:42,557 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:42,598 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:42,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:42,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:42,648 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:42,655 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c26e1c0> has no local changes
2024-05-23 00:43:42,656 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:42,665 [ scc.git] DEBUG [detached HEAD 046b57b] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:42,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:42,666 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:43,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-23 00:43:43,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-23 00:43:44,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-23 00:43:44,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-23 00:43:45,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-23 00:43:45,470 [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-23 00:43:46,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-23 00:43:46,430 [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-23 00:43:46,431 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-23 00:43:46,432 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:46,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-23 00:43:46,432 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:46,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:46,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:46,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:46,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:46,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:46,459 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:46,460 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-23 00:43:46,934 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-23 00:43:46,934 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-23 00:43:46,940 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:46,940 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:46,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:46,948 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-23 00:43:46,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:46,964 [ 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-23 00:43:46,976 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-23 00:43:46,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:46,979 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-23 00:43:46,979 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-23 00:43:47,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:47,150 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:47,199 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:47,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:47,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:47,251 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:47,259 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2f9fa0> has no local changes
2024-05-23 00:43:47,259 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:47,269 [ scc.git] DEBUG [detached HEAD af264fd] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:47,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:47,269 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:47,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-23 00:43:48,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-23 00:43:48,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-23 00:43:49,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-23 00:43:49,658 [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-23 00:43:50,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-23 00:43:50,617 [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-23 00:43:50,618 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-23 00:43:50,619 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:50,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-23 00:43:50,619 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:50,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:50,626 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:50,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:50,632 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:50,642 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:50,649 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:50,649 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-23 00:43:51,080 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-23 00:43:51,081 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-23 00:43:51,086 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:51,086 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:51,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:51,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-23 00:43:51,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:51,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-23 00:43:51,164 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG Auto-merging setup.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-23 00:43:51,165 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:43:51,165 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:43:51,171 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-23 00:43:51,177 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-23 00:43:51,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:51,350 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-23 00:43:51,359 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-23 00:43:51,365 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-05-23 00:43:51,370 [ scc.config] DEBUG Found github.token
2024-05-23 00:43:51,370 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-23 00:43:51,371 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:51,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:51,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:51,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:51,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:51,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c34cd60> has no local changes
2024-05-23 00:43:51,464 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:51,474 [ scc.git] DEBUG [detached HEAD db43523] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:51,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:51,474 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:51,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-23 00:43:52,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-23 00:43:52,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-23 00:43:53,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-23 00:43:53,740 [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-23 00:43:54,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-23 00:43:54,681 [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-23 00:43:54,682 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-23 00:43:54,682 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:54,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-23 00:43:54,682 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:54,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:54,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:54,696 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:54,696 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:54,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:54,712 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:54,712 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-23 00:43:55,170 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-23 00:43:55,170 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-23 00:43:55,175 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:55,176 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:55,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-23 00:43:55,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,195 [ 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-23 00:43:55,237 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-23 00:43:55,240 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-23 00:43:55,242 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-23 00:43:55,242 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-23 00:43:55,242 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-23 00:43:55,242 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-23 00:43:55,243 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-23 00:43:55,243 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-23 00:43:55,243 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-23 00:43:55,244 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-23 00:43:55,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:43:55,402 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:55,443 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:55,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,451 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:55,490 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:55,497 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2c2eb0> has no local changes
2024-05-23 00:43:55,497 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:55,507 [ scc.git] DEBUG [detached HEAD c59d679] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:55,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:55,507 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:55,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-23 00:43:55,833 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:55,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-23 00:43:55,833 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:55,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:55,846 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:55,846 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:55,852 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:55,859 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:55,859 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:55,859 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:55,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,865 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:55,906 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:55,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:55,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:55,953 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:55,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c2824c0> has no local changes
2024-05-23 00:43:55,960 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:55,968 [ scc.git] DEBUG [detached HEAD ae6153d] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:55,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:55,969 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:56,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-23 00:43:56,307 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:43:56,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-23 00:43:56,308 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:56,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:56,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:43:56,321 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:43:56,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:43:56,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:43:56,335 [ scc.git] DEBUG Already up to date.
2024-05-23 00:43:56,335 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:43:56,336 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:56,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:56,342 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:43:56,385 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:43:56,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:43:56,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:43:56,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:43:56,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c28bf70> has no local changes
2024-05-23 00:43:56,443 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:43:56,453 [ scc.git] DEBUG [detached HEAD 4d99bdc] merge master -Dorg -Ssuccess-only
2024-05-23 00:43:56,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:43:56,454 [ scc.git] INFO Overriding base-branch from master to main
2024-05-23 00:43:56,454 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:43:56,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-23 00:43:57,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-23 00:43:57,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-23 00:43:58,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-23 00:43:58,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-23 00:43:59,267 [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-23 00:43:59,751 [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-23 00:44:00,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-23 00:44:00,701 [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-23 00:44:00,702 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-23 00:44:00,702 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:44:00,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-23 00:44:00,703 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:00,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:00,709 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-23 00:44:00,715 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:44:00,715 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-23 00:44:00,721 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-23 00:44:00,726 [ scc.git] DEBUG Already up to date.
2024-05-23 00:44:00,727 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-23 00:44:01,147 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-23 00:44:01,147 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-23 00:44:01,153 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:44:01,153 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:01,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,159 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-23 00:44:01,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-23 00:44:01,230 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-23 00:44:01,230 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-23 00:44:01,230 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:44:01,231 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:44:01,237 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-23 00:44:01,244 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-23 00:44:01,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:01,411 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-23 00:44:01,421 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-23 00:44:01,429 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-23 00:44:01,435 [ scc.config] DEBUG Found github.token
2024-05-23 00:44:01,436 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-23 00:44:01,436 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:44:01,487 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:01,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,494 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:01,537 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:01,546 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c265e50> has no local changes
2024-05-23 00:44:01,547 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:01,557 [ scc.git] DEBUG [detached HEAD 3fd85c0] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:01,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:01,558 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:44:01,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-23 00:44:01,838 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:44:01,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-23 00:44:01,838 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:01,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,846 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:44:01,853 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:44:01,854 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:44:01,861 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:44:01,870 [ scc.git] DEBUG Already up to date.
2024-05-23 00:44:01,870 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:44:01,870 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:01,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,877 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:44:01,921 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:01,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:01,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:01,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:01,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c1ebf70> has no local changes
2024-05-23 00:44:01,977 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:01,986 [ scc.git] DEBUG [detached HEAD c04ed6c] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:01,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:01,987 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:44:02,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-23 00:44:02,269 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:44:02,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-23 00:44:02,270 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:02,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:02,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:44:02,280 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:44:02,280 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:44:02,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:44:02,291 [ scc.git] DEBUG Already up to date.
2024-05-23 00:44:02,291 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:44:02,292 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:02,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:02,297 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:44:02,337 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:02,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:02,343 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:02,385 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:02,392 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c1eb640> has no local changes
2024-05-23 00:44:02,392 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:02,402 [ scc.git] DEBUG [detached HEAD d87dcb7] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:02,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:02,403 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:44:02,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-23 00:44:03,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-23 00:44:03,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-23 00:44:04,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-23 00:44:04,713 [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-23 00:44:05,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-23 00:44:05,569 [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-23 00:44:05,570 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-23 00:44:05,570 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:44:05,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-23 00:44:05,570 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:05,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:05,577 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-23 00:44:05,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:44:05,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-23 00:44:05,590 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-23 00:44:05,596 [ scc.git] DEBUG Already up to date.
2024-05-23 00:44:05,597 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-23 00:44:06,262 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-23 00:44:06,262 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-23 00:44:06,270 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:44:06,270 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:06,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:06,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-23 00:44:06,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:06,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-23 00:44:06,348 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-23 00:44:06,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-23 00:44:06,348 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:44:06,349 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:44:06,355 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-23 00:44:06,363 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-23 00:44:06,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:06,522 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-23 00:44:06,528 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-23 00:44:06,534 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-23 00:44:06,541 [ scc.config] DEBUG Found github.token
2024-05-23 00:44:06,541 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-23 00:44:06,541 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:44:06,588 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:06,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:06,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:06,644 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:06,652 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c1ce760> has no local changes
2024-05-23 00:44:06,652 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:06,664 [ scc.git] DEBUG [detached HEAD afd1b96] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:06,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:06,665 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-23 00:44:06,665 [ scc.repo] DEBUG ## PRs found:
2024-05-23 00:44:07,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-23 00:44:07,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-23 00:44:08,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-23 00:44:08,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-23 00:44:09,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-23 00:44:09,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-23 00:44:09,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-23 00:44:10,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-23 00:44:10,874 [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-23 00:44:11,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-23 00:44:11,789 [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-23 00:44:11,790 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-23 00:44:12,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-23 00:44:12,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-23 00:44:13,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-23 00:44:13,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-23 00:44:13,783 [ scc.repo] DEBUG ## Branches found:
2024-05-23 00:44:13,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-23 00:44:13,783 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:13,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:13,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-23 00:44:13,797 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-23 00:44:13,798 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-23 00:44:13,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-23 00:44:13,810 [ scc.git] DEBUG Already up to date.
2024-05-23 00:44:13,810 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-23 00:44:14,330 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-23 00:44:14,331 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-23 00:44:14,336 [ scc.git] DEBUG ## Unique users: []
2024-05-23 00:44:14,336 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:14,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:14,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-23 00:44:14,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:14,356 [ 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-23 00:44:14,406 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-23 00:44:14,406 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-23 00:44:14,406 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-23 00:44:14,407 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-23 00:44:14,413 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-23 00:44:14,421 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-23 00:44:14,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:14,588 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-23 00:44:14,596 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-23 00:44:14,608 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#74](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-23 00:44:14,616 [ scc.config] DEBUG Found github.token
2024-05-23 00:44:14,617 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-23 00:44:14,617 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-23 00:44:14,656 [ scc.git] DEBUG Get sha1 of %s
2024-05-23 00:44:14,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-23 00:44:14,662 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:14,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:14,711 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243c240d90> has no local changes
2024-05-23 00:44:14,712 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:14,721 [ scc.git] DEBUG [detached HEAD 860c02f] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:14,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:14,721 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-23 00:44:14,801 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-23 00:44:14,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:15,016 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-23 00:44:15,022 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-23 00:44:15,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:15,417 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-23 00:44:15,424 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-23 00:44:15,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:15,822 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-23 00:44:15,828 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-23 00:44:16,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:16,230 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-23 00:44:16,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:16,657 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-23 00:44:16,664 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-23 00:44:17,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:17,065 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-23 00:44:17,075 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-23 00:44:17,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:17,470 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-23 00:44:17,478 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-23 00:44:17,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:17,886 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-23 00:44:17,893 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-23 00:44:18,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:18,304 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-23 00:44:18,308 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-23 00:44:18,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:18,717 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-23 00:44:18,723 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-23 00:44:19,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:19,129 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-23 00:44:19,136 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-23 00:44:19,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:19,544 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-23 00:44:19,551 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-23 00:44:19,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:19,977 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-23 00:44:20,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:20,382 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-23 00:44:20,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:20,786 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-23 00:44:20,791 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-23 00:44:21,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:21,192 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-23 00:44:21,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:21,606 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-23 00:44:21,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:22,004 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-23 00:44:22,010 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-23 00:44:22,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:22,416 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-23 00:44:22,423 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-23 00:44:22,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:22,818 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-23 00:44:22,825 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-23 00:44:23,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:23,246 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-23 00:44:23,253 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-23 00:44:23,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-23 00:44:23,660 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-23 00:44:23,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-23 00:44:23,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f243d410ac0> has local changes
2024-05-23 00:44:23,761 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/74/)'
2024-05-23 00:44:23,777 [ scc.git] DEBUG [detached HEAD db2fa69] merge master -Dorg -Ssuccess-only
2024-05-23 00:44:23,778 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-23 00:44:23,778 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,778 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-23 00:44:23,778 [ scc.merge] INFO
2024-05-23 00:44:23,778 [ scc.merge] INFO
2024-05-23 00:44:23,778 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-23 00:44:23,778 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-23 00:44:23,779 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-23 00:44:23,779 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-23 00:44:23,779 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-23 00:44:23,779 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,779 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-23 00:44:23,779 [ scc.merge] INFO
2024-05-23 00:44:23,779 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-23 00:44:23,780 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-23 00:44:23,780 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,780 [ scc.merge] INFO
2024-05-23 00:44:23,780 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-23 00:44:23,780 [ scc.merge] INFO
2024-05-23 00:44:23,780 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-23 00:44:23,780 [ scc.merge] INFO
2024-05-23 00:44:23,780 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-23 00:44:23,780 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-23 00:44:23,780 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,780 [ scc.merge] INFO
2024-05-23 00:44:23,780 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-23 00:44:23,780 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-23 00:44:23,781 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-23 00:44:23,781 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-23 00:44:23,781 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-23 00:44:23,781 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,781 [ scc.merge] INFO
2024-05-23 00:44:23,781 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-23 00:44:23,781 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-23 00:44:23,782 [ scc.merge] INFO
2024-05-23 00:44:23,782 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-23 00:44:23,782 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-23 00:44:23,782 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,782 [ scc.merge] INFO
2024-05-23 00:44:23,782 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-23 00:44:23,782 [ scc.merge] INFO
2024-05-23 00:44:23,782 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-23 00:44:23,782 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,782 [ scc.merge] INFO
2024-05-23 00:44:23,782 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-23 00:44:23,782 [ scc.merge] INFO
2024-05-23 00:44:23,782 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-23 00:44:23,782 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-23 00:44:23,782 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-23 00:44:23,782 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-23 00:44:23,783 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-23 00:44:23,783 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-23 00:44:23,783 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,783 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-23 00:44:23,783 [ scc.merge] INFO
2024-05-23 00:44:23,783 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-23 00:44:23,784 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,784 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-23 00:44:23,784 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Merged PRs:
2024-05-23 00:44:23,784 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-23 00:44:23,784 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-23 00:44:23,784 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO
2024-05-23 00:44:23,784 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-23 00:44:23,784 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,784 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-23 00:44:23,784 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,785 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-23 00:44:23,785 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-23 00:44:23,785 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-23 00:44:23,785 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,785 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-23 00:44:23,785 [ scc.merge] INFO
2024-05-23 00:44:23,785 [ scc.merge] INFO Repository: ome/scripts
2024-05-23 00:44:23,785 [ scc.merge] INFO Excluded PRs:
2024-05-23 00:44:23,785 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-23 00:44:23,785 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-23 00:44:23,786 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-23 00:44:23,786 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-23 00:44:23,786 [ scc.merge] INFO Already up to date.
2024-05-23 00:44:23,786 [ scc.merge] INFO
2024-05-23 00:44:23,786 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-23 00:44:23,786 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-23 00:44:23,786 [ scc.merge] INFO
2024-05-23 00:44:23,786 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-23 00:44:23,786 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-23 00:44:23,794 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-23 00:44:23,800 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-23 00:44:23,807 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-23 00:44:23,815 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-23 00:44:23,822 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-23 00:44:23,829 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-23 00:44:23,836 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-23 00:44:23,843 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-23 00:44:23,849 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-23 00:44:23,856 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-23 00:44:23,863 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-23 00:44:23,870 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-23 00:44:23,877 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-23 00:44:23,884 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-23 00:44:23,896 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-23 00:44:23,903 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-23 00:44:23,909 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-23 00:44:23,916 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-23 00:44:23,922 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-23 00:44:23,928 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-23 00:44:23,935 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-23 00:44:23,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-23 00:44:23,941 [ scc.git] DEBUG Calling 'git remote'
2024-05-23 00:44:23,947 [ 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 6edf503] 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 349daf2] 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-23 00:45:12,912 [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-23 00:45:22,038 [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-23 00:45:24,410 [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-23 00:45:29,005 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-23 00:46:16,498 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
