Skipping 95 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-05-16 00:43:16,082 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-16 00:43:16,097 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-16 00:43:16,097 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-16 00:43:16,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:16,102 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-16 00:43:16,102 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-16 00:43:16,102 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-16 00:43:16,102 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-16 00:43:16,102 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-16 00:43:16,102 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-16 00:43:16,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:16,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:43:16,495 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:16,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:16,502 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:43:16,543 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:43:16,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bb6640> has no local changes
2024-05-16 00:43:16,551 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:43:16,560 [ scc.git] DEBUG [detached HEAD 05563b2] merge master -Dorg -Ssuccess-only
2024-05-16 00:43:16,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:43:16,561 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:43:17,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-16 00:43:17,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-16 00:43:17,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-16 00:43:18,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-16 00:43:18,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-16 00:43:19,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-16 00:43:19,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b73d06c8b742151f9eccded34a4b65df343586cd HTTP/1.1" 200 None
2024-05-16 00:43:20,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b73d06c8b742151f9eccded34a4b65df343586cd?per_page=1 HTTP/1.1" 200 2
2024-05-16 00:43:20,363 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-16 00:43:20,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-16 00:43:21,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-16 00:43:21,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-16 00:43:22,299 [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-16 00:43:22,792 [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-16 00:43:23,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-16 00:43:23,725 [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-16 00:43:23,726 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-16 00:43:24,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-16 00:43:24,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-16 00:43:25,197 [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-16 00:43:25,702 [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-16 00:43:26,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-16 00:43:26,668 [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-16 00:43:26,669 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-16 00:43:27,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-16 00:43:27,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-16 00:43:27,773 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:43:27,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-16 00:43:27,773 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:27,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:27,785 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:43:27,796 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:43:27,797 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:43:27,810 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:43:27,834 [ scc.git] DEBUG Updating f8b3e4c7..3d9e3b87
2024-05-16 00:43:28,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/554 HTTP/1.1" 200 None
2024-05-16 00:43:28,330 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-16 00:43:29,096 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-16 00:43:29,096 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-16 00:43:29,102 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-16 00:43:29,722 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-16 00:43:29,722 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-16 00:43:29,728 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-16 00:43:30,410 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-16 00:43:30,410 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-16 00:43:30,417 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:43:30,417 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:30,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:30,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-16 00:43:30,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:30,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-16 00:43:30,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:30,635 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-16 00:43:30,635 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-16 00:43:30,636 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-16 00:43:30,636 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-16 00:43:30,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:30,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-16 00:43:30,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:30,885 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-16 00:43:31,042 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-16 00:43:31,042 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-16 00:43:31,042 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-16 00:43:31,043 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:31,052 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-16 00:43:31,052 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-16 00:43:31,052 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-16 00:43:31,052 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-16 00:43:31,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:31,268 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-16 00:43:31,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:31,287 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b73d06c8b742151f9eccded34a4b65df343586cd'
2024-05-16 00:43:31,538 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-16 00:43:31,538 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-16 00:43:31,538 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-16 00:43:31,538 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-16 00:43:31,538 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-16 00:43:31,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:31,548 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++-
2024-05-16 00:43:31,548 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-16 00:43:31,548 [ scc.git] DEBUG omero_figure/views.py | 69 ++++++++++++++++++++++
2024-05-16 00:43:31,548 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-16 00:43:31,548 [ scc.git] DEBUG src/index.html | 1 +
2024-05-16 00:43:31,548 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++-
2024-05-16 00:43:31,548 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-16 00:43:31,548 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-16 00:43:31,549 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-16 00:43:31,549 [ scc.git] DEBUG 14 files changed, 189 insertions(+), 13 deletions(-)
2024-05-16 00:43:31,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:31,714 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:43:31,801 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:31,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:31,820 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:43:31,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:43:31,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5c13be0> has no local changes
2024-05-16 00:43:31,911 [ 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)
Updating f8b3e4c7..3d9e3b87
Previously merged:
- PR 554 jburel 'Update publish'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
Generated by OMERO-plugins-push#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:43:31,928 [ scc.git] DEBUG [detached HEAD 31931225] merge master -Dorg -Ssuccess-only
2024-05-16 00:43:31,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:43:31,930 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:43:32,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-16 00:43:32,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-16 00:43:33,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-16 00:43:33,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-16 00:43:34,109 [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-16 00:43:34,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-16 00:43:34,979 [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-16 00:43:34,981 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-16 00:43:34,981 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:43:34,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-16 00:43:34,981 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:34,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:34,991 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:43:34,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:43:34,998 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:43:35,006 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:43:35,015 [ scc.git] DEBUG Already up to date.
2024-05-16 00:43:35,016 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-16 00:43:35,457 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-16 00:43:35,458 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-16 00:43:35,464 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:43:35,464 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:35,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:35,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-16 00:43:35,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:35,493 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-16 00:43:35,530 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-16 00:43:35,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:35,534 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-16 00:43:35,534 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-16 00:43:35,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:35,704 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:43:35,752 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:35,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:35,759 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:43:35,807 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:43:35,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bc7550> has no local changes
2024-05-16 00:43:35,816 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:43:35,827 [ scc.git] DEBUG [detached HEAD c5bdecc] merge master -Dorg -Ssuccess-only
2024-05-16 00:43:35,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:43:35,828 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:43:36,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-16 00:43:36,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-16 00:43:36,698 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-16 00:43:37,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-16 00:43:37,671 [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-16 00:43:38,133 [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-16 00:43:38,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-16 00:43:39,077 [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-16 00:43:39,078 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-16 00:43:39,079 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:43:39,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-16 00:43:39,079 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:39,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:39,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:43:39,096 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:43:39,097 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:43:39,106 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:43:39,116 [ scc.git] DEBUG Already up to date.
2024-05-16 00:43:39,117 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-16 00:43:39,557 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-16 00:43:39,558 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-16 00:43:39,564 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:43:39,565 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:39,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:39,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-16 00:43:39,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:39,582 [ 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-16 00:43:39,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:39,611 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-16 00:43:39,611 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-16 00:43:39,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:39,776 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:43:39,825 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:39,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:39,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:43:39,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:43:39,924 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bcb9d0> has no local changes
2024-05-16 00:43:39,926 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:43:39,990 [ scc.git] DEBUG [detached HEAD a0ed9ea] merge master -Dorg -Ssuccess-only
2024-05-16 00:43:39,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:43:39,995 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:43:40,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-16 00:43:40,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-16 00:43:41,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-16 00:43:41,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-16 00:43:42,415 [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-16 00:43:42,968 [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-16 00:43:43,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-16 00:43:43,829 [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-16 00:43:43,830 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-16 00:43:44,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-16 00:43:44,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-16 00:43:45,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-16 00:43:45,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-16 00:43:46,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-16 00:43:46,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-16 00:43:47,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/0eaee155506e5851ccebed9a01799cf86ebb9f63?per_page=1 HTTP/1.1" 200 2
2024-05-16 00:43:47,111 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-16 00:43:47,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-16 00:43:48,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-16 00:43:48,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-16 00:43:49,149 [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-16 00:43:49,662 [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-16 00:43:50,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-16 00:43:50,527 [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-16 00:43:50,528 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-16 00:43:51,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-16 00:43:51,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-16 00:43:52,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-16 00:43:52,550 [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-16 00:43:52,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-16 00:43:53,434 [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-16 00:43:53,434 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-16 00:43:53,435 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:43:53,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-16 00:43:53,435 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:53,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:53,442 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:43:53,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:43:53,449 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:43:53,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:43:53,465 [ scc.git] DEBUG Already up to date.
2024-05-16 00:43:53,465 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-16 00:43:53,924 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-16 00:43:53,924 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-16 00:43:53,930 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-16 00:43:55,318 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-16 00:43:55,318 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-16 00:43:55,324 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-16 00:43:55,768 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-16 00:43:55,768 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-16 00:43:55,774 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-16 00:43:56,278 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-16 00:43:56,279 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-16 00:43:56,285 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:43:56,285 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:56,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:56,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-16 00:43:56,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:56,307 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-16 00:43:56,352 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-16 00:43:56,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:56,357 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-16 00:43:56,357 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-16 00:43:56,357 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-16 00:43:56,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:56,512 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-16 00:43:56,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:56,524 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-16 00:43:56,596 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-16 00:43:56,597 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-16 00:43:56,597 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-16 00:43:56,597 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-16 00:43:56,597 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:56,603 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-16 00:43:56,603 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-16 00:43:56,603 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-16 00:43:56,603 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-16 00:43:56,603 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-16 00:43:56,603 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-16 00:43:56,603 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-16 00:43:56,603 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-16 00:43:56,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:56,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-16 00:43:56,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:56,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-16 00:43:56,967 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:56,970 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-16 00:43:56,970 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-16 00:43:57,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:57,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-16 00:43:57,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:57,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-16 00:43:57,437 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-16 00:43:57,438 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:43:57,441 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-16 00:43:57,441 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-16 00:43:57,441 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-16 00:43:57,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:43:57,844 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:43:57,894 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:43:57,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:43:57,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:43:57,943 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:43:57,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db436c5b0> has no local changes
2024-05-16 00:43:57,951 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:43:57,966 [ scc.git] DEBUG [detached HEAD 3d874e3] merge master -Dorg -Ssuccess-only
2024-05-16 00:43:57,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:43:57,966 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:43:58,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-16 00:43:58,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-16 00:43:59,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-16 00:43:59,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-16 00:44:00,414 [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-16 00:44:00,884 [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-16 00:44:01,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-16 00:44:01,805 [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-16 00:44:01,806 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-16 00:44:01,807 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:01,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-16 00:44:01,807 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:01,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:01,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:01,823 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:01,824 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:01,833 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:01,844 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:01,844 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-16 00:44:02,262 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-16 00:44:02,262 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-16 00:44:02,267 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:02,267 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:02,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:02,275 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-16 00:44:02,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:02,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-16 00:44:02,301 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:02,303 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-16 00:44:02,303 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-16 00:44:02,303 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-16 00:44:02,304 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-16 00:44:02,304 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-16 00:44:02,304 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-16 00:44:02,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:02,468 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:02,513 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:02,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:02,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:02,564 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:02,572 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5b9b8b0> has no local changes
2024-05-16 00:44:02,573 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:02,584 [ scc.git] DEBUG [detached HEAD cac1a3f] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:02,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:02,585 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:02,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-16 00:44:03,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-16 00:44:03,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-16 00:44:04,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-16 00:44:04,957 [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-16 00:44:05,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-16 00:44:05,808 [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-16 00:44:05,809 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-16 00:44:06,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-16 00:44:06,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-16 00:44:07,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-16 00:44:07,670 [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-16 00:44:08,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-16 00:44:08,520 [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-16 00:44:08,521 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-16 00:44:08,522 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:08,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-16 00:44:08,522 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:08,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:08,532 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:08,543 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:08,543 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:08,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:08,565 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:08,566 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-16 00:44:09,079 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-16 00:44:09,079 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-16 00:44:09,085 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-16 00:44:09,670 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-16 00:44:09,670 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-16 00:44:09,676 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:09,676 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:09,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:09,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-16 00:44:09,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:09,699 [ 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-16 00:44:09,778 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-16 00:44:09,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-16 00:44:09,779 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-16 00:44:09,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-16 00:44:09,779 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:44:09,779 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:44:09,787 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-16 00:44:09,795 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-16 00:44:09,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:09,961 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-16 00:44:09,971 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-16 00:44:09,980 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-16 00:44:09,988 [ scc.config] DEBUG Found github.token
2024-05-16 00:44:09,989 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-16 00:44:09,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-16 00:44:09,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:10,008 [ 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-16 00:44:10,058 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-16 00:44:10,058 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-16 00:44:10,058 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-16 00:44:10,058 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:44:10,059 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:44:10,069 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-16 00:44:10,080 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-16 00:44:10,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:10,401 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-16 00:44:10,410 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-16 00:44:10,418 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/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-16 00:44:10,425 [ scc.config] DEBUG Found github.token
2024-05-16 00:44:10,425 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-16 00:44:10,425 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:10,471 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:10,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:10,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:10,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:10,537 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db436c550> has no local changes
2024-05-16 00:44:10,538 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:10,553 [ scc.git] DEBUG [detached HEAD dff9544] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:10,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:10,554 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:10,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-16 00:44:11,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-16 00:44:11,467 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-16 00:44:11,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-16 00:44:12,414 [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-16 00:44:12,940 [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-16 00:44:13,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-16 00:44:14,026 [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-16 00:44:14,027 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-16 00:44:14,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-16 00:44:14,496 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-16 00:44:15,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-16 00:44:15,508 [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-16 00:44:15,997 [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-16 00:44:16,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-16 00:44:16,943 [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-16 00:44:16,943 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-16 00:44:17,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-16 00:44:17,411 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-16 00:44:17,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-16 00:44:18,347 [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-16 00:44:18,836 [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-16 00:44:19,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-16 00:44:19,825 [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-16 00:44:19,826 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-16 00:44:20,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-16 00:44:21,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-16 00:44:21,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-16 00:44:22,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-16 00:44:22,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-16 00:44:23,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-16 00:44:23,125 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:23,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-16 00:44:23,125 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:23,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:23,133 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:23,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:23,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:23,148 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:23,157 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:23,157 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-16 00:44:23,577 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-16 00:44:23,577 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-16 00:44:23,583 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-16 00:44:24,004 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-16 00:44:24,004 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-16 00:44:24,014 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-16 00:44:24,434 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-16 00:44:24,434 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-16 00:44:24,440 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:24,441 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:24,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:24,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-16 00:44:24,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:24,466 [ 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-16 00:44:24,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:24,484 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-16 00:44:24,484 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-16 00:44:24,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:24,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-16 00:44:24,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:24,661 [ 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-16 00:44:24,717 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-16 00:44:24,717 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:24,721 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-16 00:44:24,721 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-16 00:44:25,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:25,080 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-16 00:44:25,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:25,095 [ 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-16 00:44:25,126 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-16 00:44:25,127 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:25,131 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-16 00:44:25,131 [ scc.git] DEBUG package.json | 2 +-
2024-05-16 00:44:25,131 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-16 00:44:25,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:25,497 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:25,540 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:25,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:25,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:25,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:25,597 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bbefd0> has no local changes
2024-05-16 00:44:25,598 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:25,608 [ scc.git] DEBUG [detached HEAD a2dcbb1] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:25,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:25,609 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:26,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-16 00:44:26,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-16 00:44:26,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-16 00:44:27,407 [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-16 00:44:27,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-16 00:44:28,243 [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-16 00:44:28,244 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-16 00:44:28,244 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:28,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-16 00:44:28,244 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:28,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:28,252 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:28,258 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:28,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:28,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:28,272 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:28,273 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-16 00:44:28,665 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-16 00:44:28,665 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-16 00:44:28,671 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:28,671 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:28,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:28,681 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-16 00:44:28,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:28,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-16 00:44:28,720 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:28,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:28,880 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:28,965 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:28,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:28,974 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:29,027 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:29,036 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db4336340> has no local changes
2024-05-16 00:44:29,036 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:29,047 [ scc.git] DEBUG [detached HEAD dcb06d8] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:29,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:29,048 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:29,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-16 00:44:29,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-16 00:44:30,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-16 00:44:30,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-16 00:44:31,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-16 00:44:31,785 [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-16 00:44:32,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-16 00:44:32,637 [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-16 00:44:32,638 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-16 00:44:32,638 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:32,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-16 00:44:32,638 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:32,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:32,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:32,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:32,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:32,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:32,662 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:32,662 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-16 00:44:33,190 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-16 00:44:33,190 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-16 00:44:33,197 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:33,198 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:33,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:33,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-16 00:44:33,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:33,225 [ 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-16 00:44:33,239 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-16 00:44:33,240 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:33,243 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-16 00:44:33,243 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-16 00:44:33,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:33,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:33,470 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:33,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:33,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:33,560 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:33,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db4380910> has no local changes
2024-05-16 00:44:33,569 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:33,583 [ scc.git] DEBUG [detached HEAD b073bc7] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:33,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:33,584 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:33,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-16 00:44:34,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-16 00:44:34,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-16 00:44:35,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-16 00:44:35,865 [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-16 00:44:36,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-16 00:44:36,743 [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-16 00:44:36,744 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-16 00:44:36,744 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:36,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-16 00:44:36,745 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:36,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:36,751 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:36,758 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:36,758 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:36,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:36,773 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:36,774 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-16 00:44:37,235 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-16 00:44:37,235 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-16 00:44:37,242 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:37,242 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:37,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:37,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-16 00:44:37,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:37,274 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-16 00:44:37,360 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG Auto-merging setup.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-16 00:44:37,361 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:44:37,361 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:44:37,371 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-16 00:44:37,392 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-16 00:44:37,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:37,565 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-16 00:44:37,574 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-16 00:44:37,581 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-05-16 00:44:37,588 [ scc.config] DEBUG Found github.token
2024-05-16 00:44:37,589 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-16 00:44:37,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:37,634 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:37,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:37,642 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:37,689 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:37,698 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bcbe80> has no local changes
2024-05-16 00:44:37,699 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:37,711 [ scc.git] DEBUG [detached HEAD 5c09275] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:37,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:37,711 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:38,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-16 00:44:38,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-16 00:44:39,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-16 00:44:39,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-16 00:44:39,921 [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-16 00:44:40,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-16 00:44:40,779 [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-16 00:44:40,779 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-16 00:44:40,780 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:40,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-16 00:44:40,780 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:40,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:40,788 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:40,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:40,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:40,800 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:40,806 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:40,807 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-16 00:44:41,319 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-16 00:44:41,319 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-16 00:44:41,324 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:41,324 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:41,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:41,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-16 00:44:41,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:41,344 [ 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-16 00:44:41,407 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-16 00:44:41,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-16 00:44:41,412 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-16 00:44:41,414 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-16 00:44:41,414 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-16 00:44:41,414 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-16 00:44:41,414 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-16 00:44:41,414 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-16 00:44:41,415 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-16 00:44:41,415 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-16 00:44:41,416 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-16 00:44:41,417 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-16 00:44:41,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:41,573 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:41,617 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:41,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:41,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:41,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:41,676 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db5bbedf0> has no local changes
2024-05-16 00:44:41,677 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:41,687 [ scc.git] DEBUG [detached HEAD 27cbef2] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:41,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:41,688 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:42,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-16 00:44:42,022 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:42,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-16 00:44:42,022 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:42,034 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:42,034 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:42,041 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:42,048 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:42,048 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:42,048 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,054 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:42,098 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,108 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:42,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:42,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db438dfa0> has no local changes
2024-05-16 00:44:42,174 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:42,183 [ scc.git] DEBUG [detached HEAD 2f365c0] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:42,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:42,184 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:42,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-16 00:44:42,462 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:42,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-16 00:44:42,462 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,469 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:42,476 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:42,476 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:42,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:42,492 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:42,493 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:42,493 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,499 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:42,542 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:42,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:42,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:42,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:42,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db432bf70> has no local changes
2024-05-16 00:44:42,612 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:42,622 [ scc.git] DEBUG [detached HEAD a708d4c] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:42,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:42,622 [ scc.git] INFO Overriding base-branch from master to main
2024-05-16 00:44:42,622 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:42,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-16 00:44:43,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-16 00:44:43,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-16 00:44:44,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-16 00:44:44,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-16 00:44:45,359 [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-16 00:44:45,836 [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-16 00:44:46,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-16 00:44:46,787 [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-16 00:44:46,788 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-16 00:44:46,788 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:46,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-16 00:44:46,788 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:46,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:46,794 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-16 00:44:46,799 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:46,799 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-16 00:44:46,805 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-16 00:44:46,810 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:46,811 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-16 00:44:47,289 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-16 00:44:47,289 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-16 00:44:47,295 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:47,295 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:47,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:47,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-16 00:44:47,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:47,315 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-16 00:44:47,368 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-16 00:44:47,368 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-16 00:44:47,368 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:44:47,369 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:44:47,376 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-16 00:44:47,384 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-16 00:44:47,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:47,548 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-16 00:44:47,555 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-16 00:44:47,563 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-16 00:44:47,569 [ scc.config] DEBUG Found github.token
2024-05-16 00:44:47,569 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-16 00:44:47,570 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:47,614 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:47,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:47,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:47,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:47,669 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db430a430> has no local changes
2024-05-16 00:44:47,669 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:47,680 [ scc.git] DEBUG [detached HEAD 084144e] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:47,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:47,681 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:47,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-16 00:44:47,999 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:48,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-16 00:44:48,000 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:48,015 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:48,015 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:48,023 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:48,038 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:48,038 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:48,038 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,045 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:48,090 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,097 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:48,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:48,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db431de50> has no local changes
2024-05-16 00:44:48,150 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:48,160 [ scc.git] DEBUG [detached HEAD e7fe91d] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:48,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:48,161 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:48,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-16 00:44:48,446 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:48,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-16 00:44:48,446 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,452 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:48,458 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:48,459 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:48,465 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:48,471 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:48,472 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:48,472 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,478 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:48,519 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:48,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:48,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:48,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:48,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db4257940> has no local changes
2024-05-16 00:44:48,579 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:48,588 [ scc.git] DEBUG [detached HEAD 2f3bc49] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:48,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:48,589 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:48,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-16 00:44:49,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-16 00:44:49,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-16 00:44:50,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-16 00:44:50,900 [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-16 00:44:51,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-16 00:44:51,778 [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-16 00:44:51,779 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-16 00:44:51,779 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:51,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-16 00:44:51,779 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:51,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:51,785 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-16 00:44:51,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:51,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-16 00:44:51,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-16 00:44:51,802 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:51,802 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-16 00:44:52,275 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-16 00:44:52,275 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-16 00:44:52,281 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:44:52,281 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:52,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:52,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-16 00:44:52,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:52,306 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-16 00:44:52,340 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-16 00:44:52,340 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-16 00:44:52,340 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:44:52,341 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:44:52,350 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-16 00:44:52,360 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-16 00:44:52,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:44:52,533 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-16 00:44:52,542 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-16 00:44:52,550 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-16 00:44:52,556 [ scc.config] DEBUG Found github.token
2024-05-16 00:44:52,556 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-16 00:44:52,556 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:44:52,608 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:52,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:52,615 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:44:52,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:44:52,681 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db429f9d0> has no local changes
2024-05-16 00:44:52,682 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:44:52,801 [ scc.git] DEBUG [detached HEAD 8414d1a] merge master -Dorg -Ssuccess-only
2024-05-16 00:44:52,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:44:52,802 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-16 00:44:52,802 [ scc.repo] DEBUG ## PRs found:
2024-05-16 00:44:53,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-16 00:44:53,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-16 00:44:54,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-16 00:44:54,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-16 00:44:55,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-16 00:44:55,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-16 00:44:55,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-16 00:44:56,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-16 00:44:56,921 [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-16 00:44:57,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-16 00:44:57,777 [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-16 00:44:57,777 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-16 00:44:58,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-16 00:44:58,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-16 00:44:59,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-16 00:44:59,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-16 00:44:59,784 [ scc.repo] DEBUG ## Branches found:
2024-05-16 00:44:59,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-16 00:44:59,784 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:44:59,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:44:59,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-16 00:44:59,797 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-16 00:44:59,797 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-16 00:44:59,805 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-16 00:44:59,814 [ scc.git] DEBUG Already up to date.
2024-05-16 00:44:59,815 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-16 00:45:00,260 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-16 00:45:00,260 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-16 00:45:00,265 [ scc.git] DEBUG ## Unique users: []
2024-05-16 00:45:00,265 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:45:00,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:45:00,274 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-16 00:45:00,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:45:00,288 [ 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-16 00:45:00,320 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-16 00:45:00,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-16 00:45:00,320 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-16 00:45:00,320 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-16 00:45:00,328 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-16 00:45:00,336 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-16 00:45:00,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:00,512 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-16 00:45:00,521 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-16 00:45:00,529 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#67](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-16 00:45:00,536 [ scc.config] DEBUG Found github.token
2024-05-16 00:45:00,536 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-16 00:45:00,536 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-16 00:45:00,579 [ scc.git] DEBUG Get sha1 of %s
2024-05-16 00:45:00,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-16 00:45:00,585 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:45:00,628 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:45:00,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db4257bb0> has no local changes
2024-05-16 00:45:00,636 [ 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#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:45:00,649 [ scc.git] DEBUG [detached HEAD b8919e6] merge master -Dorg -Ssuccess-only
2024-05-16 00:45:00,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:00,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-16 00:45:00,736 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-16 00:45:00,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:00,937 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-16 00:45:00,944 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-16 00:45:01,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:01,360 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-16 00:45:01,370 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-16 00:45:01,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:01,790 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-16 00:45:01,799 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-16 00:45:02,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:02,208 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-16 00:45:02,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:02,691 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-16 00:45:02,700 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-16 00:45:03,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:03,094 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-16 00:45:03,103 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-16 00:45:03,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:03,514 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-16 00:45:03,522 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-16 00:45:03,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:03,920 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-16 00:45:03,926 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-16 00:45:04,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:04,355 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-16 00:45:04,364 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-16 00:45:04,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:04,763 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-16 00:45:04,771 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-16 00:45:05,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:05,180 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-16 00:45:05,186 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-16 00:45:05,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:05,600 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-16 00:45:05,607 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-16 00:45:06,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:06,108 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-16 00:45:06,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:06,532 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-16 00:45:06,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:06,932 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-16 00:45:06,939 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-16 00:45:07,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:07,348 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-16 00:45:07,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:07,759 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-16 00:45:08,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:08,169 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-16 00:45:08,175 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-16 00:45:08,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:08,593 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-16 00:45:08,600 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-16 00:45:08,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:09,003 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-16 00:45:09,010 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-16 00:45:09,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:09,426 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-16 00:45:09,434 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-16 00:45:09,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-16 00:45:09,829 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-16 00:45:09,829 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-16 00:45:09,945 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4db6d54ac0> has local changes
2024-05-16 00:45:09,946 [ 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)
Updating f8b3e4c7..3d9e3b87
Previously merged:
- PR 554 jburel 'Update publish'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
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 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#67 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/67/)'
2024-05-16 00:45:09,970 [ scc.git] DEBUG [detached HEAD 93f49cc] merge master -Dorg -Ssuccess-only
2024-05-16 00:45:09,970 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-16 00:45:09,971 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-16 00:45:09,971 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,971 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-16 00:45:09,971 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,971 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-16 00:45:09,971 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,971 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-16 00:45:09,971 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,971 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,971 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-16 00:45:09,971 [ scc.merge] INFO
2024-05-16 00:45:09,972 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-16 00:45:09,972 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-16 00:45:09,972 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,972 [ scc.merge] INFO
2024-05-16 00:45:09,972 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-16 00:45:09,972 [ scc.merge] INFO
2024-05-16 00:45:09,972 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-16 00:45:09,972 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-16 00:45:09,972 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,972 [ scc.merge] INFO
2024-05-16 00:45:09,972 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,972 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-16 00:45:09,973 [ scc.merge] INFO
2024-05-16 00:45:09,973 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-16 00:45:09,973 [ scc.merge] INFO
2024-05-16 00:45:09,973 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-16 00:45:09,973 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-16 00:45:09,973 [ scc.merge] INFO Updating f8b3e4c7..3d9e3b87
2024-05-16 00:45:09,973 [ scc.merge] INFO Previously merged:
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-16 00:45:09,973 [ scc.merge] INFO
2024-05-16 00:45:09,973 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-16 00:45:09,973 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-16 00:45:09,973 [ scc.merge] INFO
2024-05-16 00:45:09,973 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-16 00:45:09,973 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,974 [ scc.merge] INFO
2024-05-16 00:45:09,974 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,974 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-16 00:45:09,974 [ scc.merge] INFO
2024-05-16 00:45:09,974 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-16 00:45:09,974 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,974 [ scc.merge] INFO
2024-05-16 00:45:09,974 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,974 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-16 00:45:09,974 [ scc.merge] INFO
2024-05-16 00:45:09,974 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-16 00:45:09,974 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,974 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-16 00:45:09,974 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-16 00:45:09,974 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,974 [ scc.merge] INFO
2024-05-16 00:45:09,974 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-16 00:45:09,975 [ scc.merge] INFO
2024-05-16 00:45:09,975 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-16 00:45:09,975 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-16 00:45:09,975 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,975 [ scc.merge] INFO
2024-05-16 00:45:09,975 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,975 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-16 00:45:09,975 [ scc.merge] INFO
2024-05-16 00:45:09,975 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-16 00:45:09,975 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,975 [ scc.merge] INFO
2024-05-16 00:45:09,975 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-16 00:45:09,976 [ scc.merge] INFO
2024-05-16 00:45:09,976 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-16 00:45:09,976 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-16 00:45:09,976 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,976 [ scc.merge] INFO
2024-05-16 00:45:09,976 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-16 00:45:09,976 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-16 00:45:09,976 [ scc.merge] INFO
2024-05-16 00:45:09,976 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-16 00:45:09,977 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,977 [ scc.merge] INFO
2024-05-16 00:45:09,977 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,977 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-16 00:45:09,977 [ scc.merge] INFO
2024-05-16 00:45:09,977 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-16 00:45:09,977 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,977 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-16 00:45:09,977 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,977 [ scc.merge] INFO
2024-05-16 00:45:09,977 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,977 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-16 00:45:09,977 [ scc.merge] INFO
2024-05-16 00:45:09,977 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-16 00:45:09,977 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,977 [ scc.merge] INFO
2024-05-16 00:45:09,977 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,977 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-16 00:45:09,978 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO Merged PRs:
2024-05-16 00:45:09,978 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-16 00:45:09,978 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-16 00:45:09,978 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO
2024-05-16 00:45:09,978 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-16 00:45:09,978 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,978 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-16 00:45:09,978 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,979 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-16 00:45:09,979 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-16 00:45:09,979 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-16 00:45:09,979 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,979 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-16 00:45:09,979 [ scc.merge] INFO
2024-05-16 00:45:09,979 [ scc.merge] INFO Repository: ome/scripts
2024-05-16 00:45:09,980 [ scc.merge] INFO Excluded PRs:
2024-05-16 00:45:09,980 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-16 00:45:09,980 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-16 00:45:09,980 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-16 00:45:09,980 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-16 00:45:09,980 [ scc.merge] INFO Already up to date.
2024-05-16 00:45:09,980 [ scc.merge] INFO
2024-05-16 00:45:09,980 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-16 00:45:09,980 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-16 00:45:09,980 [ scc.merge] INFO
2024-05-16 00:45:09,980 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-16 00:45:09,980 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:09,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-16 00:45:09,990 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-16 00:45:10,003 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-16 00:45:10,012 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-16 00:45:10,024 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-16 00:45:10,035 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-16 00:45:10,047 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-16 00:45:10,058 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-16 00:45:10,069 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-16 00:45:10,080 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-16 00:45:10,092 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-16 00:45:10,103 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-16 00:45:10,115 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-16 00:45:10,124 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-16 00:45:10,135 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-16 00:45:10,143 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-16 00:45:10,152 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-16 00:45:10,161 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-16 00:45:10,172 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-16 00:45:10,182 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-16 00:45:10,191 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-16 00:45:10,201 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-16 00:45:10,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-16 00:45:10,211 [ scc.git] DEBUG Calling 'git remote'
2024-05-16 00:45:10,218 [ 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 d9793cd] 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 f8b3e4c7
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 54c3753
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 ad30b72] 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-16 00:45:59,155 [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-16 00:46:08,637 [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-16 00:46:11,194 [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-16 00:46:15,857 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-16 00:47:03,863 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
