Skipping 95 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-05-27 00:43:47,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:43:47,274 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-27 00:43:47,288 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-27 00:43:47,288 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-27 00:43:47,288 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:43:47,291 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-27 00:43:47,291 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-27 00:43:47,291 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-27 00:43:47,291 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-27 00:43:47,291 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-27 00:43:47,291 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-27 00:43:47,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:43:47,657 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:43:47,699 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:43:47,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:43:47,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:43:47,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:43:47,752 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f609fb50> has no local changes
2024-05-27 00:43:47,752 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:43:47,762 [ scc.git] DEBUG [detached HEAD c1a8184] merge master -Dorg -Ssuccess-only
2024-05-27 00:43:47,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:43:47,762 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:43:48,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-27 00:43:48,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-27 00:43:49,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-27 00:43:49,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-27 00:43:50,122 [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-27 00:43:50,617 [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-27 00:43:51,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-27 00:43:51,466 [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-27 00:43:51,467 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-27 00:43:51,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-27 00:43:52,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-27 00:43:52,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-27 00:43:53,360 [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-27 00:43:53,821 [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-27 00:43:54,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-27 00:43:54,758 [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-27 00:43:54,758 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-27 00:43:55,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-27 00:43:55,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-27 00:43:56,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-27 00:43:56,669 [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-27 00:43:57,126 [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-27 00:43:57,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-27 00:43:58,027 [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-27 00:43:58,028 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-27 00:43:58,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-27 00:43:58,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-27 00:43:59,461 [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-27 00:43:59,959 [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-27 00:44:00,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-27 00:44:00,886 [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-27 00:44:00,887 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-27 00:44:01,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-27 00:44:01,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-27 00:44:01,808 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:01,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-27 00:44:01,808 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:01,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:01,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:01,819 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:01,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:01,824 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:01,830 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:01,830 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-27 00:44:02,870 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-27 00:44:02,870 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-27 00:44:02,876 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-27 00:44:03,513 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-27 00:44:03,513 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-27 00:44:03,519 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-27 00:44:04,498 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-27 00:44:04,498 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-27 00:44:04,504 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-27 00:44:04,901 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-27 00:44:04,902 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-27 00:44:04,907 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:04,907 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:04,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:04,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-27 00:44:04,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:04,926 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-27 00:44:05,140 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-27 00:44:05,146 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-27 00:44:05,148 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-27 00:44:05,148 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-27 00:44:05,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:05,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-27 00:44:05,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:05,315 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-27 00:44:05,531 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-27 00:44:05,532 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-27 00:44:05,532 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-27 00:44:05,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:05,539 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-27 00:44:05,539 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-27 00:44:05,540 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-27 00:44:05,540 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-27 00:44:05,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:05,706 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-27 00:44:05,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:05,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-27 00:44:06,052 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-27 00:44:06,052 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-27 00:44:06,053 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-27 00:44:06,053 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-27 00:44:06,053 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-27 00:44:06,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:06,062 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-27 00:44:06,062 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-27 00:44:06,062 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/index.html | 1 +
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-27 00:44:06,062 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-27 00:44:06,064 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-27 00:44:06,065 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-27 00:44:06,065 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-27 00:44:06,065 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-27 00:44:06,065 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-27 00:44:06,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:06,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-27 00:44:06,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:06,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-27 00:44:06,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:06,258 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-27 00:44:06,258 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-27 00:44:06,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:06,628 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:06,672 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:06,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:06,678 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:06,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:06,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60e9f70> has no local changes
2024-05-27 00:44:06,738 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:06,756 [ scc.git] DEBUG [detached HEAD 96af11bc] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:06,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:06,757 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:07,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-27 00:44:07,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-27 00:44:08,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-27 00:44:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-27 00:44:09,074 [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-27 00:44:09,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-27 00:44:10,003 [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-27 00:44:10,004 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-27 00:44:10,004 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:10,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-27 00:44:10,004 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:10,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:10,012 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:10,019 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:10,019 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:10,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:10,029 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:10,029 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-27 00:44:10,413 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-27 00:44:10,413 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-27 00:44:10,417 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:10,418 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:10,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:10,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-27 00:44:10,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:10,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-27 00:44:10,453 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-27 00:44:10,454 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:10,456 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-27 00:44:10,457 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-27 00:44:10,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:10,628 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:10,669 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:10,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:10,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:10,714 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:10,721 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60e9e20> has no local changes
2024-05-27 00:44:10,721 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:10,729 [ scc.git] DEBUG [detached HEAD d8ee3cd] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:10,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:10,730 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:11,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-27 00:44:11,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-27 00:44:11,615 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-27 00:44:12,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-27 00:44:12,641 [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-27 00:44:13,111 [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-27 00:44:13,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-27 00:44:14,117 [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-27 00:44:14,118 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-27 00:44:14,118 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:14,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-27 00:44:14,118 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:14,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:14,125 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:14,129 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:14,130 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:14,134 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:14,140 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:14,140 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-27 00:44:14,511 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-27 00:44:14,512 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-27 00:44:14,516 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:14,516 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:14,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:14,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-27 00:44:14,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:14,533 [ 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-27 00:44:14,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:14,547 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-27 00:44:14,547 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-27 00:44:14,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:14,711 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:14,749 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:14,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:14,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:14,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:14,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60ccd30> has no local changes
2024-05-27 00:44:14,804 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:14,814 [ scc.git] DEBUG [detached HEAD d39d725] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:14,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:14,815 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:15,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-27 00:44:15,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-27 00:44:16,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-27 00:44:16,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-27 00:44:17,213 [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-27 00:44:17,688 [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-27 00:44:18,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-27 00:44:18,556 [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-27 00:44:18,557 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-27 00:44:19,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-27 00:44:19,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-27 00:44:19,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-27 00:44:20,459 [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-27 00:44:20,984 [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-27 00:44:21,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-27 00:44:21,892 [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-27 00:44:21,893 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-27 00:44:22,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-27 00:44:22,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-27 00:44:23,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-27 00:44:23,822 [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-27 00:44:24,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-27 00:44:24,735 [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-27 00:44:24,736 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-27 00:44:24,736 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:24,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-27 00:44:24,737 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:24,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:24,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:24,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:24,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:24,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:24,757 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:24,757 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-27 00:44:25,297 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-27 00:44:25,297 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-27 00:44:25,302 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-27 00:44:26,432 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-27 00:44:26,432 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-27 00:44:26,437 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-27 00:44:26,902 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-27 00:44:26,902 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-27 00:44:26,908 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:26,908 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:26,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:26,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-27 00:44:26,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:26,926 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-27 00:44:26,964 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-27 00:44:26,965 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:26,969 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-27 00:44:26,969 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-27 00:44:26,969 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-27 00:44:27,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:27,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-27 00:44:27,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:27,144 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-27 00:44:27,256 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-27 00:44:27,256 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-27 00:44:27,256 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-27 00:44:27,256 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-27 00:44:27,257 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:27,262 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-27 00:44:27,262 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-27 00:44:27,262 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-27 00:44:27,262 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-27 00:44:27,262 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-27 00:44:27,262 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-27 00:44:27,262 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-27 00:44:27,263 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-27 00:44:27,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:27,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-27 00:44:27,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:27,563 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-27 00:44:27,610 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-27 00:44:27,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:27,614 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-27 00:44:27,614 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-27 00:44:27,614 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-27 00:44:28,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:28,019 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:28,080 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:28,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:28,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:28,126 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:28,138 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60a0310> has no local changes
2024-05-27 00:44:28,138 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:28,150 [ scc.git] DEBUG [detached HEAD c15144a] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:28,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:28,150 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:28,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-27 00:44:29,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-27 00:44:29,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-27 00:44:30,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-27 00:44:30,575 [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-27 00:44:31,103 [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-27 00:44:31,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-27 00:44:31,938 [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-27 00:44:31,940 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-27 00:44:31,940 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:31,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-27 00:44:31,941 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:31,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:31,947 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:31,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:31,954 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:31,959 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:31,964 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:31,964 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-27 00:44:32,321 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-27 00:44:32,321 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-27 00:44:32,326 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:32,326 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:32,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:32,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-27 00:44:32,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:32,345 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-27 00:44:32,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:32,357 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-27 00:44:32,357 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-27 00:44:32,357 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-27 00:44:32,357 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-27 00:44:32,357 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-27 00:44:32,357 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-27 00:44:32,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:32,519 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:32,560 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:32,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:32,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:32,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:32,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f4068b50> has no local changes
2024-05-27 00:44:32,612 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:32,621 [ scc.git] DEBUG [detached HEAD 14343bd] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:32,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:32,622 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:33,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-27 00:44:33,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-27 00:44:34,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-27 00:44:34,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-27 00:44:35,048 [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-27 00:44:35,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-27 00:44:35,926 [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-27 00:44:35,927 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-27 00:44:36,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-27 00:44:36,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-27 00:44:37,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-27 00:44:37,802 [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-27 00:44:38,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-27 00:44:38,722 [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-27 00:44:38,723 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-27 00:44:38,723 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:38,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-27 00:44:38,723 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:38,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:38,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:38,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:38,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:38,742 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:38,748 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:38,749 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-27 00:44:39,275 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-27 00:44:39,275 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-27 00:44:39,280 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-27 00:44:39,819 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-27 00:44:39,819 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-27 00:44:39,825 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:39,825 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:39,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:39,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-27 00:44:39,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:39,846 [ 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-27 00:44:39,904 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-27 00:44:39,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-27 00:44:39,904 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-27 00:44:39,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-27 00:44:39,904 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:44:39,905 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:44:39,913 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-27 00:44:39,923 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-27 00:44:40,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:40,087 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-27 00:44:40,095 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-27 00:44:40,103 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-27 00:44:40,110 [ scc.config] DEBUG Found github.token
2024-05-27 00:44:40,110 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-27 00:44:40,110 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-27 00:44:40,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:40,128 [ 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-27 00:44:40,166 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-27 00:44:40,167 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-27 00:44:40,167 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-27 00:44:40,167 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:44:40,167 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:44:40,176 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-27 00:44:40,183 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-27 00:44:40,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:40,494 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-27 00:44:40,504 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-27 00:44:40,512 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/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-27 00:44:40,518 [ scc.config] DEBUG Found github.token
2024-05-27 00:44:40,519 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-27 00:44:40,519 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:40,566 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:40,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:40,572 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:40,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:40,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f608ff10> has no local changes
2024-05-27 00:44:40,620 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:40,631 [ scc.git] DEBUG [detached HEAD 64a4c8f] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:40,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:40,631 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:41,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-27 00:44:41,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-27 00:44:41,535 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-27 00:44:42,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-27 00:44:42,578 [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-27 00:44:43,081 [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-27 00:44:43,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-27 00:44:43,940 [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-27 00:44:43,941 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-27 00:44:44,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-27 00:44:44,408 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-27 00:44:44,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-27 00:44:45,484 [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-27 00:44:45,964 [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-27 00:44:46,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-27 00:44:46,844 [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-27 00:44:46,845 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-27 00:44:47,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-27 00:44:47,321 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-27 00:44:47,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-27 00:44:48,373 [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-27 00:44:48,844 [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-27 00:44:49,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-27 00:44:49,806 [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-27 00:44:49,807 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-27 00:44:50,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-27 00:44:50,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-27 00:44:51,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-27 00:44:51,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-27 00:44:52,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-27 00:44:52,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-27 00:44:52,640 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:52,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-27 00:44:52,640 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:52,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:52,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:52,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:52,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:52,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:52,663 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:52,664 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-27 00:44:53,037 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-27 00:44:53,037 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-27 00:44:53,042 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-27 00:44:53,425 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-27 00:44:53,425 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-27 00:44:53,430 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-27 00:44:53,795 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-27 00:44:53,796 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-27 00:44:53,801 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:53,801 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:53,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:53,808 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-27 00:44:53,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:53,817 [ 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-27 00:44:53,826 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:53,829 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-27 00:44:53,829 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-27 00:44:53,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:53,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-27 00:44:53,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:53,993 [ 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-27 00:44:54,031 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-27 00:44:54,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:54,035 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-27 00:44:54,035 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-27 00:44:54,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:54,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-27 00:44:54,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:54,405 [ 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-27 00:44:54,428 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-27 00:44:54,429 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:54,432 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-27 00:44:54,432 [ scc.git] DEBUG package.json | 2 +-
2024-05-27 00:44:54,432 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-27 00:44:54,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:54,803 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:54,847 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:54,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:54,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:54,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:54,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f4021640> has no local changes
2024-05-27 00:44:54,896 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:54,904 [ scc.git] DEBUG [detached HEAD d37033a] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:54,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:54,905 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:55,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-27 00:44:55,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-27 00:44:56,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-27 00:44:56,732 [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-27 00:44:57,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-27 00:44:57,678 [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-27 00:44:57,679 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-27 00:44:57,679 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:44:57,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-27 00:44:57,679 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:57,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:57,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:44:57,692 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:44:57,692 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:44:57,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:44:57,705 [ scc.git] DEBUG Already up to date.
2024-05-27 00:44:57,705 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-27 00:44:58,073 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-27 00:44:58,073 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-27 00:44:58,081 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:44:58,081 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:58,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:58,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-27 00:44:58,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:58,102 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-27 00:44:58,112 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:44:58,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:44:58,264 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:44:58,316 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:44:58,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:44:58,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:44:58,364 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:44:58,371 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60a8df0> has no local changes
2024-05-27 00:44:58,372 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:44:58,383 [ scc.git] DEBUG [detached HEAD 0fd4a31] merge master -Dorg -Ssuccess-only
2024-05-27 00:44:58,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:44:58,383 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:44:58,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-27 00:44:59,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-27 00:44:59,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-27 00:45:00,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-27 00:45:00,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-27 00:45:01,188 [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-27 00:45:01,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-27 00:45:02,120 [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-27 00:45:02,120 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-27 00:45:02,121 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:02,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-27 00:45:02,121 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:02,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:02,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:02,135 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:02,136 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:02,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:02,151 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:02,151 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-27 00:45:02,724 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-27 00:45:02,724 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-27 00:45:02,731 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:02,731 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:02,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:02,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-27 00:45:02,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:02,756 [ 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-27 00:45:02,769 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-27 00:45:02,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:45:02,772 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-27 00:45:02,773 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-27 00:45:02,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:02,937 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:02,995 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:02,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:03,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:03,050 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:03,059 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7c8520> has no local changes
2024-05-27 00:45:03,059 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:03,071 [ scc.git] DEBUG [detached HEAD 56764a5] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:03,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:03,071 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:03,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-27 00:45:03,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-27 00:45:04,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-27 00:45:04,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-27 00:45:05,460 [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-27 00:45:06,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-27 00:45:06,446 [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-27 00:45:06,447 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-27 00:45:06,447 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:06,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-27 00:45:06,447 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:06,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:06,457 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:06,464 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:06,464 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:06,473 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:06,483 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:06,483 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-27 00:45:06,874 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-27 00:45:06,875 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-27 00:45:06,882 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:06,882 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:06,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:06,892 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-27 00:45:06,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:06,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-27 00:45:06,959 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG Auto-merging setup.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-27 00:45:06,959 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:45:06,960 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:45:06,971 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-27 00:45:06,981 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-27 00:45:07,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:07,153 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-27 00:45:07,163 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-27 00:45:07,172 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-05-27 00:45:07,181 [ scc.config] DEBUG Found github.token
2024-05-27 00:45:07,181 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-27 00:45:07,182 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:07,245 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:07,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:07,253 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:07,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:07,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7c8670> has no local changes
2024-05-27 00:45:07,334 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:07,348 [ scc.git] DEBUG [detached HEAD 5030e66] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:07,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:07,350 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:07,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-27 00:45:08,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-27 00:45:08,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-27 00:45:09,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-27 00:45:09,534 [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-27 00:45:10,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-27 00:45:10,440 [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-27 00:45:10,441 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-27 00:45:10,441 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:10,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-27 00:45:10,441 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:10,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:10,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:10,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:10,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:10,461 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:10,472 [ scc.git] DEBUG Updating a0148a6..7688c54
2024-05-27 00:45:11,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls/69 HTTP/1.1" 200 None
2024-05-27 00:45:11,124 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-27 00:45:11,559 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-27 00:45:11,560 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-27 00:45:11,567 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:11,567 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:11,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:11,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-27 00:45:11,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:11,585 [ 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-27 00:45:11,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-27 00:45:11,603 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-27 00:45:11,603 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-27 00:45:11,603 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-27 00:45:11,603 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-27 00:45:11,603 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-27 00:45:11,604 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-27 00:45:11,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-27 00:45:11,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-27 00:45:11,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-27 00:45:11,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-27 00:45:11,605 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-27 00:45:11,606 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-27 00:45:11,606 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-27 00:45:11,606 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-27 00:45:11,607 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-27 00:45:11,607 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-27 00:45:11,607 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-27 00:45:11,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:11,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:11,820 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:11,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:11,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:11,882 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:11,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7c8580> has no local changes
2024-05-27 00:45:11,891 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Updating a0148a6..7688c54
Previously merged:
- PR 69 jburel 'use build'
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:11,902 [ scc.git] DEBUG [detached HEAD 13df0ef] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:11,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:11,903 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:12,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-27 00:45:12,198 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:12,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-27 00:45:12,198 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,205 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:12,209 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:12,210 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:12,214 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:12,219 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:12,219 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:12,219 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:12,260 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,265 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:12,302 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:12,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f4015d60> has no local changes
2024-05-27 00:45:12,308 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:12,315 [ scc.git] DEBUG [detached HEAD c78a196] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:12,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:12,316 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:12,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-27 00:45:12,628 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:12,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-27 00:45:12,628 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,637 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:12,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:12,645 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:12,652 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:12,665 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:12,665 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:12,665 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,672 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:12,731 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:12,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:12,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:12,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:12,806 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7d9bb0> has no local changes
2024-05-27 00:45:12,806 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:12,821 [ scc.git] DEBUG [detached HEAD 86833ea] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:12,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:12,822 [ scc.git] INFO Overriding base-branch from master to main
2024-05-27 00:45:12,822 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:13,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-27 00:45:13,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-27 00:45:14,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-27 00:45:14,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-27 00:45:15,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-27 00:45:15,756 [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-27 00:45:16,285 [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-27 00:45:16,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-27 00:45:17,236 [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-27 00:45:17,238 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-27 00:45:17,238 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:17,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-27 00:45:17,239 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:17,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:17,253 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-27 00:45:17,266 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:17,266 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-27 00:45:17,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-27 00:45:17,292 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:17,292 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-27 00:45:17,734 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-27 00:45:17,735 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-27 00:45:17,744 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:17,745 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:17,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:17,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-27 00:45:17,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:17,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-27 00:45:17,793 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-27 00:45:17,793 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-27 00:45:17,793 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:45:17,793 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:45:17,801 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-27 00:45:17,810 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-27 00:45:17,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:17,971 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-27 00:45:17,980 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-27 00:45:17,988 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-27 00:45:17,995 [ scc.config] DEBUG Found github.token
2024-05-27 00:45:17,996 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-27 00:45:17,996 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:18,068 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,079 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:18,144 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:18,151 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f60ccb80> has no local changes
2024-05-27 00:45:18,152 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:18,160 [ scc.git] DEBUG [detached HEAD afed040] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:18,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:18,160 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:18,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-27 00:45:18,400 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:18,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-27 00:45:18,400 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:18,426 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:18,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:18,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:18,454 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:18,454 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:18,454 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,466 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:18,548 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:18,590 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:18,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7dde50> has no local changes
2024-05-27 00:45:18,596 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:18,604 [ scc.git] DEBUG [detached HEAD ab8d731] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:18,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:18,605 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:18,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-27 00:45:18,839 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:18,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-27 00:45:18,839 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,848 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:18,856 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:18,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:18,863 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:18,869 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:18,869 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:18,869 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,876 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:18,918 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:18,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:18,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:18,981 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:18,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc744490> has no local changes
2024-05-27 00:45:18,991 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:19,001 [ scc.git] DEBUG [detached HEAD 111d3ea] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:19,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:19,002 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:19,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-27 00:45:19,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-27 00:45:20,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-27 00:45:20,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-27 00:45:21,171 [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-27 00:45:21,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-27 00:45:22,111 [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-27 00:45:22,112 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-27 00:45:22,112 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:22,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-27 00:45:22,112 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:22,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:22,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-27 00:45:22,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:22,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-27 00:45:22,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-27 00:45:22,141 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:22,141 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-27 00:45:22,623 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-27 00:45:22,623 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-27 00:45:22,628 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:22,628 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:22,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:22,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-27 00:45:22,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:22,648 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-27 00:45:22,716 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-27 00:45:22,716 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-27 00:45:22,717 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:45:22,717 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:45:22,724 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-27 00:45:22,732 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-27 00:45:22,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:22,895 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-27 00:45:22,901 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-27 00:45:22,907 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-27 00:45:22,913 [ scc.config] DEBUG Found github.token
2024-05-27 00:45:22,913 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-27 00:45:22,913 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:22,951 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:22,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:22,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:22,996 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:23,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc788be0> has no local changes
2024-05-27 00:45:23,003 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:23,012 [ scc.git] DEBUG [detached HEAD 2990642] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:23,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:23,013 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-27 00:45:23,013 [ scc.repo] DEBUG ## PRs found:
2024-05-27 00:45:23,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-27 00:45:23,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-27 00:45:24,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-27 00:45:24,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-27 00:45:25,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-27 00:45:25,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-27 00:45:26,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-27 00:45:26,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-27 00:45:27,210 [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-27 00:45:27,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-27 00:45:28,078 [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-27 00:45:28,079 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-27 00:45:28,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-27 00:45:29,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-27 00:45:29,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-27 00:45:30,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-27 00:45:30,031 [ scc.repo] DEBUG ## Branches found:
2024-05-27 00:45:30,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-27 00:45:30,031 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:30,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:30,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-27 00:45:30,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-27 00:45:30,047 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-27 00:45:30,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-27 00:45:30,057 [ scc.git] DEBUG Already up to date.
2024-05-27 00:45:30,058 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-27 00:45:30,502 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-27 00:45:30,502 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-27 00:45:30,508 [ scc.git] DEBUG ## Unique users: []
2024-05-27 00:45:30,508 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:30,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:30,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-27 00:45:30,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:30,533 [ 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-27 00:45:30,573 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-27 00:45:30,573 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-27 00:45:30,573 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-27 00:45:30,574 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-27 00:45:30,581 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-27 00:45:30,590 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-27 00:45:30,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:30,798 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-27 00:45:30,807 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-27 00:45:30,815 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#78](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-27 00:45:30,823 [ scc.config] DEBUG Found github.token
2024-05-27 00:45:30,823 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-27 00:45:30,823 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-27 00:45:30,875 [ scc.git] DEBUG Get sha1 of %s
2024-05-27 00:45:30,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-27 00:45:30,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:30,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:30,940 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3dc7b7d30> has no local changes
2024-05-27 00:45:30,941 [ 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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:30,954 [ scc.git] DEBUG [detached HEAD 03d7dd1] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:30,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:30,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-27 00:45:31,039 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-27 00:45:31,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:31,219 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-27 00:45:31,225 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-27 00:45:31,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:31,629 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-27 00:45:31,635 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-27 00:45:32,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:32,027 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-27 00:45:32,032 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-27 00:45:32,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:32,454 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-27 00:45:32,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:32,862 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-27 00:45:32,866 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-27 00:45:33,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:33,276 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-27 00:45:33,280 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-27 00:45:33,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:33,688 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-27 00:45:33,693 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-27 00:45:34,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:34,099 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-27 00:45:34,104 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-27 00:45:34,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:34,512 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-27 00:45:34,518 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-27 00:45:34,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:34,927 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-27 00:45:34,932 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-27 00:45:35,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:35,347 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-27 00:45:35,352 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-27 00:45:35,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:35,756 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-27 00:45:35,761 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-27 00:45:36,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:36,162 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-27 00:45:36,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:36,568 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-27 00:45:36,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:36,974 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-27 00:45:36,981 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-27 00:45:37,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:37,402 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-27 00:45:37,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:37,812 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-27 00:45:38,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:38,220 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-27 00:45:38,227 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-27 00:45:38,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:38,638 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-27 00:45:38,643 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-27 00:45:39,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:39,064 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-27 00:45:39,069 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-27 00:45:39,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:39,505 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-27 00:45:39,510 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-27 00:45:39,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-27 00:45:39,972 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-27 00:45:39,973 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-27 00:45:40,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f71f52e0> has local changes
2024-05-27 00:45:40,063 [ 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
Updating a0148a6..7688c54
Previously merged:
- PR 69 jburel 'use build'
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#78 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/78/)'
2024-05-27 00:45:40,078 [ scc.git] DEBUG [detached HEAD ebdb022] merge master -Dorg -Ssuccess-only
2024-05-27 00:45:40,079 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-27 00:45:40,079 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-27 00:45:40,079 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-27 00:45:40,079 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-27 00:45:40,079 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,079 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-27 00:45:40,079 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,079 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-27 00:45:40,079 [ scc.merge] INFO
2024-05-27 00:45:40,079 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-27 00:45:40,079 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,079 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-27 00:45:40,080 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-27 00:45:40,080 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-27 00:45:40,080 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-27 00:45:40,080 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-27 00:45:40,080 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,080 [ scc.merge] INFO
2024-05-27 00:45:40,080 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-27 00:45:40,081 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-27 00:45:40,081 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-27 00:45:40,081 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-27 00:45:40,081 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-27 00:45:40,081 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-27 00:45:40,081 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-27 00:45:40,081 [ scc.merge] INFO
2024-05-27 00:45:40,081 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-27 00:45:40,081 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,081 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-27 00:45:40,082 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-27 00:45:40,082 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-27 00:45:40,082 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-27 00:45:40,082 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-27 00:45:40,082 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-27 00:45:40,082 [ scc.merge] INFO Updating a0148a6..7688c54
2024-05-27 00:45:40,082 [ scc.merge] INFO Previously merged:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 69 jburel 'use build'
2024-05-27 00:45:40,082 [ scc.merge] INFO
2024-05-27 00:45:40,082 [ scc.merge] INFO Merged PRs:
2024-05-27 00:45:40,082 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-27 00:45:40,083 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,083 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,083 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-27 00:45:40,083 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,083 [ scc.merge] INFO
2024-05-27 00:45:40,083 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,083 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-27 00:45:40,084 [ scc.merge] INFO
2024-05-27 00:45:40,084 [ scc.merge] INFO Repository: ome/scripts
2024-05-27 00:45:40,084 [ scc.merge] INFO Excluded PRs:
2024-05-27 00:45:40,084 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-27 00:45:40,084 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-27 00:45:40,084 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-27 00:45:40,084 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-27 00:45:40,084 [ scc.merge] INFO Already up to date.
2024-05-27 00:45:40,084 [ scc.merge] INFO
2024-05-27 00:45:40,084 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-27 00:45:40,084 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-27 00:45:40,084 [ scc.merge] INFO
2024-05-27 00:45:40,084 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-27 00:45:40,084 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-27 00:45:40,090 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-27 00:45:40,096 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-27 00:45:40,101 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-27 00:45:40,106 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-27 00:45:40,111 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-27 00:45:40,118 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-27 00:45:40,124 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-27 00:45:40,130 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-27 00:45:40,136 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-27 00:45:40,142 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-27 00:45:40,147 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-27 00:45:40,153 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-27 00:45:40,158 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-27 00:45:40,164 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-27 00:45:40,171 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-27 00:45:40,177 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-27 00:45:40,183 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-27 00:45:40,189 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-27 00:45:40,196 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-27 00:45:40,203 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-27 00:45:40,209 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-27 00:45:40,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-27 00:45:40,216 [ scc.git] DEBUG Calling 'git remote'
2024-05-27 00:45:40,224 [ 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 c0d9c60] 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 242a7f8] 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-27 00:46:27,442 [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-27 00:46:36,375 [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-27 00:46:38,725 [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-27 00:46:43,396 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-27 00:47:30,062 [ 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}
