Skipping 94 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-05-24 00:43:55,085 [ scc.config] DEBUG Found github.token
2024-05-24 00:43:55,085 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-24 00:43:55,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-24 00:43:55,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:43:55,096 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-24 00:43:55,108 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-24 00:43:55,108 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-24 00:43:55,108 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:43:55,111 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-24 00:43:55,111 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-24 00:43:55,111 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-24 00:43:55,111 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-24 00:43:55,111 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-24 00:43:55,111 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-24 00:43:55,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:43:55,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:43:55,521 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:43:55,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:43:55,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:43:55,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:43:55,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df08dfb50> has no local changes
2024-05-24 00:43:55,579 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:43:55,590 [ scc.git] DEBUG [detached HEAD 9e49f77] merge master -Dorg -Ssuccess-only
2024-05-24 00:43:55,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:43:55,590 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:43:56,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-24 00:43:56,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-24 00:43:56,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-24 00:43:57,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-24 00:43:57,946 [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-24 00:43:58,435 [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-24 00:43:58,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-24 00:43:59,345 [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-24 00:43:59,346 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-24 00:43:59,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-24 00:44:00,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-24 00:44:00,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-24 00:44:01,270 [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-24 00:44:01,723 [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-24 00:44:02,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-24 00:44:02,614 [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-24 00:44:02,615 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-24 00:44:03,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-24 00:44:03,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-24 00:44:04,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-24 00:44:04,518 [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-24 00:44:04,975 [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-24 00:44:05,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-24 00:44:05,908 [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-24 00:44:05,909 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-24 00:44:06,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-24 00:44:06,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-24 00:44:07,345 [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-24 00:44:07,831 [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-24 00:44:08,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-24 00:44:08,756 [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-24 00:44:08,757 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-24 00:44:09,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-24 00:44:09,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-24 00:44:09,687 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:09,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-24 00:44:09,688 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:09,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:09,697 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:09,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:09,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:09,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:09,722 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:09,722 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-24 00:44:10,129 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-24 00:44:10,130 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-24 00:44:10,135 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-24 00:44:10,527 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-24 00:44:10,528 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-24 00:44:10,533 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-24 00:44:10,946 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-24 00:44:10,947 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-24 00:44:10,953 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-24 00:44:11,403 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-24 00:44:11,404 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-24 00:44:11,411 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:11,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:11,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:11,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-24 00:44:11,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:11,437 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-24 00:44:11,453 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:11,458 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-24 00:44:11,459 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-24 00:44:11,461 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-24 00:44:11,461 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-24 00:44:11,461 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-24 00:44:11,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:11,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-24 00:44:11,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:11,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-24 00:44:11,874 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-24 00:44:11,874 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-24 00:44:11,875 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-24 00:44:11,875 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:11,882 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-24 00:44:11,882 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-24 00:44:11,884 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-24 00:44:11,884 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-24 00:44:11,884 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-24 00:44:11,884 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-24 00:44:12,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:12,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-24 00:44:12,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:12,057 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-24 00:44:12,292 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-24 00:44:12,292 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-24 00:44:12,292 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-24 00:44:12,292 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-24 00:44:12,292 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-24 00:44:12,292 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:12,300 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-24 00:44:12,300 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-24 00:44:12,300 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/index.html | 1 +
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-24 00:44:12,300 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-24 00:44:12,300 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-24 00:44:12,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:12,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-24 00:44:12,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:12,473 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-24 00:44:12,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:12,499 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-24 00:44:12,499 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-24 00:44:12,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:12,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:12,928 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:12,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:12,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:12,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:12,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df0935f70> has no local changes
2024-05-24 00:44:12,992 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:13,006 [ scc.git] DEBUG [detached HEAD 925043f3] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:13,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:13,006 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:13,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-24 00:44:13,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-24 00:44:14,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-24 00:44:14,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-24 00:44:15,261 [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-24 00:44:15,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-24 00:44:16,117 [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-24 00:44:16,118 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-24 00:44:16,118 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:16,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-24 00:44:16,118 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:16,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:16,124 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:16,130 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:16,130 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:16,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:16,143 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:16,143 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-24 00:44:16,506 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-24 00:44:16,506 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-24 00:44:16,512 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:16,512 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:16,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:16,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-24 00:44:16,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:16,545 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-24 00:44:16,592 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-24 00:44:16,593 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:16,596 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-24 00:44:16,596 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-24 00:44:16,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:16,756 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:16,814 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:16,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:16,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:16,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:16,876 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df0935e20> has no local changes
2024-05-24 00:44:16,877 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:16,887 [ scc.git] DEBUG [detached HEAD f4e5883] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:16,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:16,888 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:17,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-24 00:44:17,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-24 00:44:17,701 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-24 00:44:18,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-24 00:44:18,749 [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-24 00:44:19,266 [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-24 00:44:19,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-24 00:44:20,232 [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-24 00:44:20,233 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-24 00:44:20,233 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:20,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-24 00:44:20,234 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:20,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:20,242 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:20,248 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:20,248 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:20,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:20,261 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:20,262 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-24 00:44:20,678 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-24 00:44:20,678 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-24 00:44:20,682 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:20,683 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:20,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:20,689 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-24 00:44:20,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:20,702 [ 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-24 00:44:20,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:20,719 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-24 00:44:20,719 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-24 00:44:20,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:20,893 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:20,940 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:20,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:20,948 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:20,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:20,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df090cd30> has no local changes
2024-05-24 00:44:20,999 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:21,011 [ scc.git] DEBUG [detached HEAD ac1fbf1] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:21,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:21,011 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:21,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-24 00:44:21,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-24 00:44:22,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-24 00:44:22,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-24 00:44:23,366 [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-24 00:44:23,844 [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-24 00:44:24,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-24 00:44:24,691 [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-24 00:44:24,692 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-24 00:44:25,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-24 00:44:25,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-24 00:44:26,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-24 00:44:26,598 [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-24 00:44:27,066 [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-24 00:44:27,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-24 00:44:27,993 [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-24 00:44:27,995 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-24 00:44:28,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-24 00:44:28,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-24 00:44:29,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-24 00:44:29,888 [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-24 00:44:30,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-24 00:44:30,809 [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-24 00:44:30,810 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-24 00:44:30,810 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:30,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-24 00:44:30,811 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:30,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:30,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:30,823 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:30,824 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:30,830 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:30,837 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:30,838 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-24 00:44:31,370 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-24 00:44:31,370 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-24 00:44:31,375 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-24 00:44:32,294 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-24 00:44:32,294 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-24 00:44:32,300 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-24 00:44:32,790 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-24 00:44:32,790 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-24 00:44:32,798 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:32,799 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:32,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:32,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-24 00:44:32,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:32,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-24 00:44:32,881 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-24 00:44:32,882 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:32,886 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-24 00:44:32,886 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-24 00:44:32,886 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-24 00:44:33,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:33,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-24 00:44:33,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:33,065 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-24 00:44:33,250 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-24 00:44:33,250 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-24 00:44:33,250 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-24 00:44:33,250 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-24 00:44:33,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:33,255 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-24 00:44:33,255 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-24 00:44:33,255 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-24 00:44:33,255 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-24 00:44:33,255 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-24 00:44:33,255 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-24 00:44:33,255 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-24 00:44:33,255 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-24 00:44:33,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:33,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-24 00:44:33,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:33,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-24 00:44:33,555 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-24 00:44:33,556 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:33,561 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-24 00:44:33,561 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-24 00:44:33,561 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-24 00:44:33,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:33,877 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:33,925 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:33,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:33,935 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:33,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:34,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df08e1310> has no local changes
2024-05-24 00:44:34,002 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:34,015 [ scc.git] DEBUG [detached HEAD afce8a7] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:34,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:34,016 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:34,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-24 00:44:34,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-24 00:44:35,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-24 00:44:35,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-24 00:44:36,352 [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-24 00:44:36,858 [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-24 00:44:37,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-24 00:44:37,704 [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-24 00:44:37,705 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-24 00:44:37,706 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:37,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-24 00:44:37,706 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:37,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:37,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:37,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:37,723 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:37,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:37,736 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:37,737 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-24 00:44:38,137 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-24 00:44:38,137 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-24 00:44:38,142 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:38,143 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:38,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:38,151 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-24 00:44:38,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:38,166 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-24 00:44:38,180 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:44:38,183 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-24 00:44:38,183 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-24 00:44:38,183 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-24 00:44:38,183 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-24 00:44:38,183 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-24 00:44:38,183 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-24 00:44:38,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:38,344 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:38,388 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:38,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:38,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:38,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:38,446 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df00abb50> has no local changes
2024-05-24 00:44:38,446 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:38,457 [ scc.git] DEBUG [detached HEAD 6818862] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:38,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:38,458 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:38,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-24 00:44:39,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-24 00:44:39,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-24 00:44:40,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-24 00:44:40,863 [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-24 00:44:41,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-24 00:44:41,805 [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-24 00:44:41,806 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-24 00:44:42,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-24 00:44:42,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-24 00:44:43,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-24 00:44:43,712 [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-24 00:44:44,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-24 00:44:44,636 [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-24 00:44:44,637 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-24 00:44:44,637 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:44,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-24 00:44:44,637 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:44,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:44,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:44,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:44,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:44,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:44,662 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:44,663 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-24 00:44:45,174 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-24 00:44:45,174 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-24 00:44:45,181 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-24 00:44:45,708 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-24 00:44:45,708 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-24 00:44:45,713 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:44:45,713 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:45,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:45,719 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-24 00:44:45,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:45,731 [ 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-24 00:44:45,809 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-24 00:44:45,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-24 00:44:45,809 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-24 00:44:45,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-24 00:44:45,809 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:44:45,809 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:44:45,816 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-24 00:44:45,823 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-24 00:44:45,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:45,983 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-24 00:44:45,991 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-24 00:44:45,998 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-24 00:44:46,004 [ scc.config] DEBUG Found github.token
2024-05-24 00:44:46,004 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-24 00:44:46,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-24 00:44:46,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:46,036 [ 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-24 00:44:46,102 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-24 00:44:46,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-24 00:44:46,103 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-24 00:44:46,103 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:44:46,103 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:44:46,110 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-24 00:44:46,118 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-24 00:44:46,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:44:46,392 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-24 00:44:46,400 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-24 00:44:46,406 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/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-24 00:44:46,411 [ scc.config] DEBUG Found github.token
2024-05-24 00:44:46,411 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-24 00:44:46,411 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:44:46,452 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:46,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:46,458 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:44:46,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:44:46,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df08ecf10> has no local changes
2024-05-24 00:44:46,507 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:44:46,517 [ scc.git] DEBUG [detached HEAD bb794c3] merge master -Dorg -Ssuccess-only
2024-05-24 00:44:46,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:44:46,518 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:44:46,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-24 00:44:47,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-24 00:44:47,393 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-24 00:44:47,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-24 00:44:48,461 [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-24 00:44:48,955 [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-24 00:44:49,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-24 00:44:49,895 [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-24 00:44:49,896 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-24 00:44:50,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-24 00:44:50,371 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-24 00:44:50,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-24 00:44:51,486 [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-24 00:44:51,948 [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-24 00:44:52,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-24 00:44:52,947 [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-24 00:44:52,948 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-24 00:44:53,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-24 00:44:53,414 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-24 00:44:53,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-24 00:44:54,486 [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-24 00:44:54,996 [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-24 00:44:55,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-24 00:44:55,967 [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-24 00:44:55,968 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-24 00:44:56,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-24 00:44:56,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-24 00:44:57,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-24 00:44:57,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-24 00:44:58,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-24 00:44:58,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-24 00:44:58,813 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:44:58,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-24 00:44:58,814 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:44:58,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:44:58,822 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:44:58,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:44:58,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:44:58,842 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:44:58,850 [ scc.git] DEBUG Already up to date.
2024-05-24 00:44:58,850 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-24 00:44:59,240 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-24 00:44:59,240 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-24 00:44:59,254 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-24 00:44:59,641 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-24 00:44:59,642 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-24 00:44:59,651 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-24 00:45:00,065 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-24 00:45:00,065 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-24 00:45:00,071 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:00,072 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:00,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:00,080 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-24 00:45:00,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:00,097 [ 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-24 00:45:00,109 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:00,113 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-24 00:45:00,113 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-24 00:45:00,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:00,271 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-24 00:45:00,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:00,301 [ 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-24 00:45:00,379 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-24 00:45:00,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:00,387 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-24 00:45:00,387 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-24 00:45:00,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:00,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-24 00:45:00,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:00,718 [ 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-24 00:45:00,734 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-24 00:45:00,735 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:00,739 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-24 00:45:00,739 [ scc.git] DEBUG package.json | 2 +-
2024-05-24 00:45:00,739 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-24 00:45:01,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:01,107 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:01,217 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:01,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:01,228 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:01,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:01,330 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df0063640> has no local changes
2024-05-24 00:45:01,331 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:01,344 [ scc.git] DEBUG [detached HEAD 9e86d42] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:01,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:01,344 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:01,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-24 00:45:02,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-24 00:45:02,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-24 00:45:03,068 [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-24 00:45:03,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-24 00:45:04,001 [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-24 00:45:04,003 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-24 00:45:04,003 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:04,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-24 00:45:04,003 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:04,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:04,013 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:04,025 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:04,025 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:04,036 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:04,049 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:04,049 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-24 00:45:04,468 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-24 00:45:04,468 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-24 00:45:04,480 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:04,481 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:04,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:04,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-24 00:45:04,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:04,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-24 00:45:04,547 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:04,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:04,708 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:04,762 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:04,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:04,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:04,830 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:04,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df08e9df0> has no local changes
2024-05-24 00:45:04,840 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:04,850 [ scc.git] DEBUG [detached HEAD 81b693f] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:04,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:04,851 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:05,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-24 00:45:05,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-24 00:45:06,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-24 00:45:06,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-24 00:45:07,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-24 00:45:07,729 [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-24 00:45:08,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-24 00:45:08,580 [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-24 00:45:08,582 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-24 00:45:08,582 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:08,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-24 00:45:08,582 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:08,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:08,592 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:08,598 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:08,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:08,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:08,614 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:08,615 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-24 00:45:09,086 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-24 00:45:09,086 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-24 00:45:09,096 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:09,096 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:09,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:09,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-24 00:45:09,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:09,130 [ 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-24 00:45:09,145 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-24 00:45:09,146 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:09,149 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-24 00:45:09,149 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-24 00:45:09,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:09,309 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:09,374 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:09,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:09,386 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:09,447 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:09,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df001c520> has no local changes
2024-05-24 00:45:09,462 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:09,480 [ scc.git] DEBUG [detached HEAD fd2e20f] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:09,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:09,481 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:09,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-24 00:45:10,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-24 00:45:10,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-24 00:45:11,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-24 00:45:11,969 [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-24 00:45:12,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-24 00:45:12,843 [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-24 00:45:12,845 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-24 00:45:12,845 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:12,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-24 00:45:12,845 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:12,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:12,858 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:12,870 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:12,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:12,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:12,899 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:12,899 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-24 00:45:13,357 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-24 00:45:13,358 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-24 00:45:13,363 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:13,364 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:13,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:13,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-24 00:45:13,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:13,396 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-24 00:45:13,501 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG Auto-merging setup.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-24 00:45:13,502 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:45:13,503 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:45:13,515 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-24 00:45:13,529 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-24 00:45:13,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:13,682 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-24 00:45:13,692 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-24 00:45:13,701 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-05-24 00:45:13,709 [ scc.config] DEBUG Found github.token
2024-05-24 00:45:13,710 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-24 00:45:13,710 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:13,763 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:13,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:13,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:13,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:13,830 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df001c670> has no local changes
2024-05-24 00:45:13,831 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:13,841 [ scc.git] DEBUG [detached HEAD 01675ca] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:13,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:13,842 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:14,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-24 00:45:14,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-24 00:45:15,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-24 00:45:15,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-24 00:45:16,077 [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-24 00:45:16,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-24 00:45:17,046 [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-24 00:45:17,047 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-24 00:45:17,047 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:17,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-24 00:45:17,048 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:17,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:17,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:17,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:17,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:17,083 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:17,097 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:17,098 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-24 00:45:17,536 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-24 00:45:17,536 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-24 00:45:17,548 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:17,549 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:17,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:17,556 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-24 00:45:17,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:17,574 [ 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-24 00:45:17,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:45:17,621 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-24 00:45:17,624 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-24 00:45:17,625 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-24 00:45:17,625 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-24 00:45:17,625 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-24 00:45:17,625 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-24 00:45:17,625 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-24 00:45:17,625 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-24 00:45:17,625 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-24 00:45:17,626 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-24 00:45:17,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:17,788 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:17,864 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:17,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:17,874 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:17,919 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:17,929 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df001c580> has no local changes
2024-05-24 00:45:17,929 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:17,941 [ scc.git] DEBUG [detached HEAD b6cc3df] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:17,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:17,942 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:18,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-24 00:45:18,217 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:18,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-24 00:45:18,217 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,225 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:18,234 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:18,234 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:18,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:18,256 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:18,257 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:18,257 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,266 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:18,324 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:18,387 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:18,399 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df004fd60> has no local changes
2024-05-24 00:45:18,399 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:18,412 [ scc.git] DEBUG [detached HEAD a2ccc95] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:18,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:18,413 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:18,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-24 00:45:18,656 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:18,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-24 00:45:18,656 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:18,670 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:18,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:18,677 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:18,685 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:18,686 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:18,686 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,692 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:18,734 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:18,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:18,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:18,783 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:18,789 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df002cbb0> has no local changes
2024-05-24 00:45:18,790 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:18,798 [ scc.git] DEBUG [detached HEAD 84592e0] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:18,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:18,799 [ scc.git] INFO Overriding base-branch from master to main
2024-05-24 00:45:18,799 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:19,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-24 00:45:19,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-24 00:45:20,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-24 00:45:20,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-24 00:45:21,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-24 00:45:21,636 [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-24 00:45:22,133 [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-24 00:45:22,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-24 00:45:22,988 [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-24 00:45:22,989 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-24 00:45:22,989 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:22,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-24 00:45:22,989 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:22,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:22,998 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-24 00:45:23,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:23,008 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-24 00:45:23,018 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-24 00:45:23,032 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:23,033 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-24 00:45:23,503 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-24 00:45:23,503 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-24 00:45:23,508 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:23,508 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:23,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:23,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-24 00:45:23,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:23,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-24 00:45:23,589 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-24 00:45:23,589 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-24 00:45:23,589 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:45:23,590 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:45:23,597 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-24 00:45:23,603 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-24 00:45:23,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:23,772 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-24 00:45:23,778 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-24 00:45:23,783 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-24 00:45:23,788 [ scc.config] DEBUG Found github.token
2024-05-24 00:45:23,789 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-24 00:45:23,789 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:23,831 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:23,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:23,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:23,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:23,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df090cb80> has no local changes
2024-05-24 00:45:23,885 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:23,894 [ scc.git] DEBUG [detached HEAD da91170] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:23,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:23,895 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:24,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-24 00:45:24,213 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:24,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-24 00:45:24,213 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,219 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:24,225 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:24,225 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:24,231 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:24,236 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:24,236 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:24,237 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,242 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:24,285 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,291 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:24,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:24,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df0033e50> has no local changes
2024-05-24 00:45:24,340 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:24,349 [ scc.git] DEBUG [detached HEAD 3af03b4] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:24,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:24,350 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:24,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-24 00:45:24,659 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:24,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-24 00:45:24,659 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,667 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:24,674 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:24,675 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:24,682 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:24,689 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:24,689 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:24,689 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,695 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:24,757 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:24,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:24,766 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:24,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:24,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3de0783490> has no local changes
2024-05-24 00:45:24,820 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:24,830 [ scc.git] DEBUG [detached HEAD 610fcf3] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:24,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:24,830 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:25,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-24 00:45:25,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-24 00:45:26,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-24 00:45:26,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-24 00:45:27,011 [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-24 00:45:27,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-24 00:45:27,866 [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-24 00:45:27,866 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-24 00:45:27,866 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:27,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-24 00:45:27,867 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:27,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:27,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:45:27,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:27,880 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:45:27,887 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:45:27,894 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:27,894 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-24 00:45:28,327 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-24 00:45:28,327 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-24 00:45:28,332 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:28,332 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:28,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:28,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-24 00:45:28,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:28,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-24 00:45:28,395 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-24 00:45:28,395 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-24 00:45:28,395 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:45:28,396 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:45:28,403 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-24 00:45:28,413 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-24 00:45:28,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:28,579 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-24 00:45:28,585 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-24 00:45:28,592 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-24 00:45:28,597 [ scc.config] DEBUG Found github.token
2024-05-24 00:45:28,597 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-24 00:45:28,597 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:28,647 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:28,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:28,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:28,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:28,705 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3de07c8be0> has no local changes
2024-05-24 00:45:28,705 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:28,715 [ scc.git] DEBUG [detached HEAD e92a943] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:28,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:28,716 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-24 00:45:28,716 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:45:29,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-24 00:45:29,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-24 00:45:30,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-24 00:45:30,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-24 00:45:31,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-24 00:45:31,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-24 00:45:32,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-24 00:45:32,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-24 00:45:32,954 [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-24 00:45:33,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-24 00:45:33,804 [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-24 00:45:33,804 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-24 00:45:34,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-24 00:45:34,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-24 00:45:35,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-24 00:45:35,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-24 00:45:35,691 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:45:35,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-24 00:45:35,691 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:35,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:35,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-24 00:45:35,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:45:35,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-24 00:45:35,715 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-24 00:45:35,723 [ scc.git] DEBUG Already up to date.
2024-05-24 00:45:35,723 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-24 00:45:36,208 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-24 00:45:36,208 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-24 00:45:36,215 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:45:36,215 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:36,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:36,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-24 00:45:36,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:36,241 [ 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-24 00:45:36,310 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-24 00:45:36,310 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-24 00:45:36,310 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-24 00:45:36,310 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-24 00:45:36,319 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-24 00:45:36,329 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-24 00:45:36,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:36,482 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-24 00:45:36,491 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-24 00:45:36,498 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#75](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-24 00:45:36,503 [ scc.config] DEBUG Found github.token
2024-05-24 00:45:36,504 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-24 00:45:36,504 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:45:36,548 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:45:36,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:45:36,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:36,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:36,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3de07f4d30> has no local changes
2024-05-24 00:45:36,612 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:36,624 [ scc.git] DEBUG [detached HEAD 861a6fc] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:36,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:36,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:45:36,719 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-24 00:45:36,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:36,930 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-24 00:45:36,935 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-24 00:45:37,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:37,341 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-24 00:45:37,347 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-24 00:45:37,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:37,774 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-24 00:45:37,780 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-24 00:45:38,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:38,190 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-24 00:45:38,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:38,600 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-24 00:45:38,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-24 00:45:38,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:39,013 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-24 00:45:39,022 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-24 00:45:39,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:39,415 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-24 00:45:39,425 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-24 00:45:39,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:39,820 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-24 00:45:39,828 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-24 00:45:40,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:40,233 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-24 00:45:40,244 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-24 00:45:40,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:40,643 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-24 00:45:40,651 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-24 00:45:41,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:41,045 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-24 00:45:41,052 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-24 00:45:41,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:41,461 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-24 00:45:41,467 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-24 00:45:41,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:41,874 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-24 00:45:42,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:42,294 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-24 00:45:42,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:42,695 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-24 00:45:42,701 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-24 00:45:43,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:43,115 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-24 00:45:43,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:43,519 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-24 00:45:43,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:43,931 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-24 00:45:43,938 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-24 00:45:44,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:44,345 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-24 00:45:44,354 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-24 00:45:44,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:44,756 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-24 00:45:44,761 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-24 00:45:45,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:45,184 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-24 00:45:45,188 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-24 00:45:45,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:45:45,588 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-24 00:45:45,588 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:45:45,671 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3df1a352e0> has local changes
2024-05-24 00:45:45,672 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/75/)'
2024-05-24 00:45:45,689 [ scc.git] DEBUG [detached HEAD de9ef2e] merge master -Dorg -Ssuccess-only
2024-05-24 00:45:45,689 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-24 00:45:45,689 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-24 00:45:45,689 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,689 [ scc.merge] INFO
2024-05-24 00:45:45,689 [ scc.merge] INFO
2024-05-24 00:45:45,689 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-24 00:45:45,689 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,689 [ scc.merge] INFO
2024-05-24 00:45:45,689 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-24 00:45:45,690 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-24 00:45:45,690 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-24 00:45:45,690 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-24 00:45:45,690 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-24 00:45:45,690 [ scc.merge] INFO
2024-05-24 00:45:45,690 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-24 00:45:45,690 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,690 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-24 00:45:45,690 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-24 00:45:45,691 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-24 00:45:45,691 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-24 00:45:45,691 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-24 00:45:45,691 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-24 00:45:45,691 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-24 00:45:45,691 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,691 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,691 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-24 00:45:45,691 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-24 00:45:45,692 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-24 00:45:45,692 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-24 00:45:45,692 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-24 00:45:45,692 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-24 00:45:45,692 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-24 00:45:45,692 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,692 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-24 00:45:45,692 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,692 [ scc.merge] INFO
2024-05-24 00:45:45,692 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,693 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Merged PRs:
2024-05-24 00:45:45,693 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-24 00:45:45,693 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,693 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,693 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-24 00:45:45,693 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,693 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,693 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-24 00:45:45,693 [ scc.merge] INFO
2024-05-24 00:45:45,694 [ scc.merge] INFO Repository: ome/scripts
2024-05-24 00:45:45,694 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:45:45,694 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-24 00:45:45,694 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-24 00:45:45,694 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-24 00:45:45,694 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-24 00:45:45,694 [ scc.merge] INFO Already up to date.
2024-05-24 00:45:45,694 [ scc.merge] INFO
2024-05-24 00:45:45,694 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-24 00:45:45,694 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-24 00:45:45,694 [ scc.merge] INFO
2024-05-24 00:45:45,694 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-24 00:45:45,694 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-24 00:45:45,700 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-24 00:45:45,705 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-24 00:45:45,710 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-24 00:45:45,715 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-24 00:45:45,719 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-24 00:45:45,725 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-24 00:45:45,730 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-24 00:45:45,735 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-24 00:45:45,740 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-24 00:45:45,746 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-24 00:45:45,751 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-24 00:45:45,756 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-24 00:45:45,761 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-24 00:45:45,767 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-24 00:45:45,773 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-24 00:45:45,779 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-24 00:45:45,788 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-24 00:45:45,797 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-24 00:45:45,804 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-24 00:45:45,811 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-24 00:45:45,816 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-24 00:45:45,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-24 00:45:45,822 [ scc.git] DEBUG Calling 'git remote'
2024-05-24 00:45:45,830 [ 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 6a433de] 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 d95eb52] 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-24 00:46:32,943 [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-24 00:46:41,920 [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-24 00:46:44,279 [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-24 00:46:48,823 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-24 00:47:36,567 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/dbd9644a/images/svgs/logo.svg){kind=logo}
