Console Output
Skipping 77 KB..
Full LogFound github.token
2024-05-20 00:43:50,336 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-20 00:43:50,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-20 00:43:50,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:43:50,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-20 00:43:50,361 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-20 00:43:50,361 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-20 00:43:50,362 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:43:50,365 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-20 00:43:50,365 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-20 00:43:50,365 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-20 00:43:50,365 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-20 00:43:50,365 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-20 00:43:50,366 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-20 00:43:50,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:43:50,722 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:43:50,765 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:43:50,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:43:50,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:43:50,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:43:50,826 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80836e640> has no local changes
2024-05-20 00:43:50,826 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:43:50,834 [ scc.git] DEBUG [detached HEAD b148815] merge master -Dorg -Ssuccess-only
2024-05-20 00:43:50,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:43:50,835 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:43:51,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-20 00:43:51,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-20 00:43:52,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-20 00:43:52,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-20 00:43:53,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-20 00:43:53,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-20 00:43:53,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-05-20 00:43:53,933 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-20 00:43:54,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-20 00:43:54,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-20 00:43:55,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919 HTTP/1.1" 200 None
2024-05-20 00:43:55,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-20 00:43:56,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-20 00:43:56,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-20 00:43:57,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-20 00:43:57,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-20 00:43:58,104 [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-20 00:43:58,568 [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-20 00:43:59,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-20 00:43:59,473 [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-20 00:43:59,475 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-20 00:43:59,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-20 00:44:00,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-20 00:44:00,916 [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-20 00:44:01,373 [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-20 00:44:01,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-20 00:44:02,228 [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-20 00:44:02,229 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-20 00:44:02,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-20 00:44:03,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-20 00:44:03,155 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:03,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-20 00:44:03,155 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:03,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:03,165 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:03,194 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:03,195 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:03,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:03,228 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:03,228 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-20 00:44:04,262 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-20 00:44:04,263 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-20 00:44:04,270 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-20 00:44:04,961 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-20 00:44:04,962 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-20 00:44:04,967 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-20 00:44:05,355 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-20 00:44:05,356 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-20 00:44:05,362 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:05,363 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:05,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:05,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-20 00:44:05,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:05,388 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-20 00:44:05,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:05,540 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-20 00:44:05,540 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-20 00:44:05,540 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-20 00:44:05,542 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-20 00:44:05,542 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-20 00:44:05,542 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-20 00:44:05,543 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-20 00:44:05,543 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-20 00:44:05,543 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-20 00:44:05,543 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-20 00:44:05,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:05,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-20 00:44:05,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:05,723 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-20 00:44:05,847 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-20 00:44:05,847 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-20 00:44:05,847 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-20 00:44:05,848 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:05,856 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-20 00:44:05,856 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-20 00:44:05,856 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-20 00:44:05,857 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-20 00:44:05,857 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-20 00:44:05,857 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-20 00:44:06,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:06,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-20 00:44:06,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:06,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-20 00:44:06,163 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:06,166 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-20 00:44:06,166 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-20 00:44:06,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:06,527 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:06,571 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:06,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:06,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:06,632 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:06,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8083afbe0> has no local changes
2024-05-20 00:44:06,642 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (status: failure)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:06,653 [ scc.git] DEBUG [detached HEAD c2625e65] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:06,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:06,654 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:07,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-20 00:44:07,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-20 00:44:07,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-20 00:44:08,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-20 00:44:08,888 [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-20 00:44:09,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-20 00:44:09,843 [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-20 00:44:09,846 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-20 00:44:09,846 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:09,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-20 00:44:09,847 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:09,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:09,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:09,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:09,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:09,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:09,905 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:09,906 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-20 00:44:10,327 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-20 00:44:10,327 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-20 00:44:10,334 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:10,334 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:10,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:10,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-20 00:44:10,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:10,379 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-20 00:44:10,435 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-20 00:44:10,436 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:10,442 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-20 00:44:10,442 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-20 00:44:10,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:10,599 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:10,660 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:10,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:10,677 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:10,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:10,750 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80837e550> has no local changes
2024-05-20 00:44:10,750 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:10,764 [ scc.git] DEBUG [detached HEAD d72a488] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:10,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:10,765 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:11,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-20 00:44:11,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-20 00:44:11,574 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-20 00:44:12,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-20 00:44:12,489 [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-20 00:44:12,988 [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-20 00:44:13,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-20 00:44:13,861 [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-20 00:44:13,862 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-20 00:44:13,862 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:13,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-20 00:44:13,863 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:13,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:13,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:13,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:13,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:13,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:13,893 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:13,894 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-20 00:44:14,275 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-20 00:44:14,275 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-20 00:44:14,287 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:14,288 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:14,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:14,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-20 00:44:14,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:14,316 [ 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-20 00:44:14,330 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:14,335 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-20 00:44:14,335 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-20 00:44:14,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:14,489 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:14,531 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:14,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:14,537 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:14,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:14,611 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808386820> has no local changes
2024-05-20 00:44:14,611 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:14,627 [ scc.git] DEBUG [detached HEAD bb011af] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:14,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:14,629 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:15,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-20 00:44:15,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/475 HTTP/1.1" 200 None
2024-05-20 00:44:15,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f HTTP/1.1" 200 None
2024-05-20 00:44:16,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-20 00:44:16,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-20 00:44:17,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f HTTP/1.1" 200 None
2024-05-20 00:44:17,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/4a89dc6f0646b38c9c91d5f15003dcabad5c479f?per_page=1 HTTP/1.1" 200 2
2024-05-20 00:44:17,696 [ scc.repo] DEBUG - PR 475 will-moore 'Update build and publish in gha'
2024-05-20 00:44:18,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-20 00:44:18,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-20 00:44:19,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-20 00:44:19,566 [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-20 00:44:20,034 [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-20 00:44:20,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-20 00:44:20,891 [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-20 00:44:20,892 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-20 00:44:21,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-20 00:44:21,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-20 00:44:22,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-20 00:44:22,667 [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-20 00:44:23,129 [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-20 00:44:23,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-20 00:44:24,033 [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-20 00:44:24,035 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-20 00:44:24,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-20 00:44:24,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-20 00:44:25,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-20 00:44:25,916 [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-20 00:44:26,393 [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-20 00:44:26,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-20 00:44:27,245 [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-20 00:44:27,247 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-20 00:44:27,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-20 00:44:28,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-20 00:44:28,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-20 00:44:29,060 [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-20 00:44:29,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-20 00:44:29,918 [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-20 00:44:29,919 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-20 00:44:29,920 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:29,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-20 00:44:29,920 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:29,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:29,928 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:29,936 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:29,937 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:29,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:29,958 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:29,958 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-20 00:44:30,380 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-20 00:44:30,380 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-20 00:44:30,386 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-20 00:44:31,279 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-20 00:44:31,279 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-20 00:44:31,286 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-20 00:44:31,753 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-20 00:44:31,754 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-20 00:44:31,761 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-20 00:44:32,221 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-20 00:44:32,221 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-20 00:44:32,233 [ scc.git] DEBUG Calling 'git fetch origin pull/475/head'
2024-05-20 00:44:32,671 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-20 00:44:32,681 [ scc.git] DEBUG * branch refs/pull/475/head -> FETCH_HEAD
2024-05-20 00:44:32,705 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:32,705 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:32,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:32,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-20 00:44:32,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:32,729 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-20 00:44:32,785 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-20 00:44:32,787 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:32,792 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-20 00:44:32,792 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-20 00:44:32,792 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-20 00:44:32,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:32,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-20 00:44:32,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:32,971 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-20 00:44:33,057 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-20 00:44:33,057 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-20 00:44:33,057 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-20 00:44:33,057 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-20 00:44:33,057 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:33,063 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-20 00:44:33,064 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-20 00:44:33,064 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-20 00:44:33,064 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-20 00:44:33,064 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-20 00:44:33,064 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-20 00:44:33,064 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-20 00:44:33,064 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-20 00:44:33,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:33,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-20 00:44:33,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:33,378 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-20 00:44:33,413 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:33,416 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-20 00:44:33,416 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-20 00:44:33,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:33,772 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-20 00:44:33,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:33,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-20 00:44:33,859 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-20 00:44:33,860 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:33,863 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-20 00:44:33,863 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-20 00:44:33,863 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-20 00:44:34,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:34,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a89dc6f0646b38c9c91d5f15003dcabad5c479f'
2024-05-20 00:44:34,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:34,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 475 (Update build and publish in gha) 4a89dc6f0646b38c9c91d5f15003dcabad5c479f'
2024-05-20 00:44:34,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:34,229 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-20 00:44:34,230 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-20 00:44:34,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:34,602 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:34,665 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:34,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:34,672 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:34,730 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:34,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8083265b0> has no local changes
2024-05-20 00:44:34,744 [ 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'
- PR 475 will-moore 'Update build and publish in gha'
Generated by OMERO-plugins-push#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:34,755 [ scc.git] DEBUG [detached HEAD 075ab1e] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:34,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:34,756 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:35,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-20 00:44:35,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-20 00:44:36,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-20 00:44:36,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-20 00:44:36,964 [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-20 00:44:37,419 [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-20 00:44:37,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-20 00:44:38,268 [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-20 00:44:38,270 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-20 00:44:38,270 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:38,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-20 00:44:38,270 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:38,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:38,281 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:38,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:38,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:38,299 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:38,308 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:38,308 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-20 00:44:38,709 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-20 00:44:38,709 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-20 00:44:38,717 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:38,717 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:38,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:38,726 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-20 00:44:38,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:38,744 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-20 00:44:38,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:44:38,763 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-20 00:44:38,764 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-20 00:44:38,764 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-20 00:44:38,764 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-20 00:44:38,764 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-20 00:44:38,764 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-20 00:44:38,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:38,935 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:39,007 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:39,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:39,019 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:39,087 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:39,099 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80838c4f0> has no local changes
2024-05-20 00:44:39,099 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:39,113 [ scc.git] DEBUG [detached HEAD cbcb94a] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:39,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:39,114 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:39,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-20 00:44:39,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-20 00:44:40,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-20 00:44:40,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-20 00:44:41,357 [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-20 00:44:41,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-20 00:44:42,218 [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-20 00:44:42,220 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-20 00:44:42,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-20 00:44:43,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-20 00:44:43,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-20 00:44:44,066 [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-20 00:44:44,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-20 00:44:44,912 [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-20 00:44:44,915 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-20 00:44:44,916 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:44,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-20 00:44:44,917 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:44,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:45,013 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:45,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:45,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:45,055 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:45,099 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:45,100 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-20 00:44:45,596 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-20 00:44:45,597 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-20 00:44:45,605 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-20 00:44:46,501 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-20 00:44:46,502 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-20 00:44:46,511 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:44:46,511 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:46,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:46,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-20 00:44:46,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:46,542 [ 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-20 00:44:46,719 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-20 00:44:46,719 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-20 00:44:46,719 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-20 00:44:46,719 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-20 00:44:46,720 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:44:46,720 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:44:46,731 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-20 00:44:46,741 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-20 00:44:46,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:46,900 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-20 00:44:46,909 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-20 00:44:46,917 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-20 00:44:46,925 [ scc.config] DEBUG Found github.token
2024-05-20 00:44:46,925 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-20 00:44:46,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-20 00:44:46,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:46,944 [ 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-20 00:44:46,984 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-20 00:44:46,985 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-20 00:44:46,985 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-20 00:44:46,986 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:44:46,988 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:44:47,000 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-20 00:44:47,015 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-20 00:44:47,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:44:47,316 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-20 00:44:47,329 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-20 00:44:47,341 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/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-20 00:44:47,350 [ scc.config] DEBUG Found github.token
2024-05-20 00:44:47,350 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-20 00:44:47,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:44:47,404 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:47,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:47,414 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:44:47,467 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:44:47,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808326550> has no local changes
2024-05-20 00:44:47,486 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:44:47,504 [ scc.git] DEBUG [detached HEAD ca2f073] merge master -Dorg -Ssuccess-only
2024-05-20 00:44:47,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:44:47,505 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:44:47,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-20 00:44:48,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-20 00:44:48,332 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-20 00:44:48,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-20 00:44:49,279 [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-20 00:44:49,749 [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-20 00:44:50,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-20 00:44:50,610 [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-20 00:44:50,611 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-20 00:44:51,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-20 00:44:51,067 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-20 00:44:51,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-20 00:44:51,993 [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-20 00:44:52,460 [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-20 00:44:52,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-20 00:44:53,317 [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-20 00:44:53,318 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-20 00:44:53,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-20 00:44:53,783 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-20 00:44:54,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-20 00:44:54,721 [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-20 00:44:55,188 [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-20 00:44:55,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-20 00:44:56,066 [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-20 00:44:56,068 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-20 00:44:56,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-20 00:44:56,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-20 00:44:57,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-20 00:44:57,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-20 00:44:58,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-20 00:44:58,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-20 00:44:58,945 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:44:58,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-20 00:44:58,945 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:44:58,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:44:58,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:44:59,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:44:59,019 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:44:59,030 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:44:59,068 [ scc.git] DEBUG Already up to date.
2024-05-20 00:44:59,069 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-20 00:44:59,514 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-20 00:44:59,514 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-20 00:44:59,520 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-20 00:44:59,907 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-20 00:44:59,908 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-20 00:44:59,915 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-20 00:45:00,323 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-20 00:45:00,324 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-20 00:45:00,329 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:00,329 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:00,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:00,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-20 00:45:00,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:00,354 [ 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-20 00:45:00,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:00,394 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-20 00:45:00,395 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-20 00:45:00,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:00,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-20 00:45:00,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:00,577 [ 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-20 00:45:00,589 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-20 00:45:00,590 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:00,593 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-20 00:45:00,593 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-20 00:45:00,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:00,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-20 00:45:01,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:01,013 [ 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-20 00:45:01,047 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-20 00:45:01,048 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:01,056 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-20 00:45:01,056 [ scc.git] DEBUG package.json | 2 +-
2024-05-20 00:45:01,056 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-20 00:45:01,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:01,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:01,492 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:01,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:01,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:01,543 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:01,580 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808357fd0> has no local changes
2024-05-20 00:45:01,581 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:01,590 [ scc.git] DEBUG [detached HEAD f28f6cf] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:01,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:01,591 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:01,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-20 00:45:02,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-20 00:45:02,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-20 00:45:03,247 [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-20 00:45:03,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-20 00:45:04,159 [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-20 00:45:04,160 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-20 00:45:04,160 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:04,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-20 00:45:04,161 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:04,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:04,203 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:04,247 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:04,247 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:04,256 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:04,302 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:04,302 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-20 00:45:04,696 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-20 00:45:04,697 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-20 00:45:04,702 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:04,702 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:04,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:04,710 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-20 00:45:04,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:04,723 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-20 00:45:04,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:04,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:04,911 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:04,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:04,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:04,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:05,009 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:05,118 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8082f0340> has no local changes
2024-05-20 00:45:05,119 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:05,129 [ scc.git] DEBUG [detached HEAD 951195f] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:05,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:05,129 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:05,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-20 00:45:05,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-20 00:45:06,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-20 00:45:06,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-20 00:45:07,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-20 00:45:07,715 [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-20 00:45:08,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-20 00:45:08,579 [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-20 00:45:08,579 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-20 00:45:08,579 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:08,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-20 00:45:08,580 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:08,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:08,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:08,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:08,702 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:08,710 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:08,745 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:08,745 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-20 00:45:09,204 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-20 00:45:09,204 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-20 00:45:09,212 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:09,212 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:09,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:09,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-20 00:45:09,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:09,236 [ 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-20 00:45:09,259 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-20 00:45:09,286 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:09,289 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-20 00:45:09,289 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-20 00:45:09,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:09,450 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:09,494 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:09,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:09,500 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:09,542 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:09,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80832ea00> has no local changes
2024-05-20 00:45:09,609 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:09,619 [ scc.git] DEBUG [detached HEAD 1eea41e] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:09,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:09,620 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:09,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-20 00:45:10,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-20 00:45:10,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-20 00:45:11,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-20 00:45:11,693 [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-20 00:45:12,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-20 00:45:12,607 [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-20 00:45:12,608 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-20 00:45:12,608 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:12,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-20 00:45:12,608 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:12,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:12,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:12,746 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:12,746 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:12,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:12,795 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:12,796 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-20 00:45:13,427 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-20 00:45:13,427 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-20 00:45:13,432 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:13,432 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:13,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:13,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-20 00:45:13,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:13,451 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-20 00:45:13,570 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG Auto-merging setup.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-20 00:45:13,570 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:45:13,571 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:45:13,578 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-20 00:45:13,584 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-20 00:45:13,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:13,742 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-20 00:45:13,749 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-20 00:45:13,756 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-05-20 00:45:13,762 [ scc.config] DEBUG Found github.token
2024-05-20 00:45:13,762 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-20 00:45:13,762 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:13,808 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:13,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:13,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:13,860 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:13,930 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808386df0> has no local changes
2024-05-20 00:45:13,931 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:13,942 [ scc.git] DEBUG [detached HEAD f6c2f14] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:13,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:13,943 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:14,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-20 00:45:14,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-20 00:45:15,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-20 00:45:15,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-20 00:45:16,116 [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-20 00:45:16,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-20 00:45:16,977 [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-20 00:45:16,977 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-20 00:45:16,978 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:16,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-20 00:45:16,978 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:16,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:17,031 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:17,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:17,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:17,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:17,108 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:17,108 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-20 00:45:17,565 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-20 00:45:17,565 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-20 00:45:17,570 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:17,570 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:17,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:17,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-20 00:45:17,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:17,591 [ 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-20 00:45:17,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-20 00:45:17,714 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-20 00:45:17,714 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-20 00:45:17,714 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-20 00:45:17,714 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-20 00:45:17,714 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-20 00:45:17,715 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-20 00:45:17,715 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-20 00:45:17,715 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-20 00:45:17,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-20 00:45:17,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-20 00:45:17,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-20 00:45:17,717 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-20 00:45:17,717 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-20 00:45:17,718 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-20 00:45:17,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:17,867 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:17,915 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:17,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:17,923 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:17,969 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:18,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808357df0> has no local changes
2024-05-20 00:45:18,005 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:18,016 [ scc.git] DEBUG [detached HEAD 4ed0afc] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:18,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:18,017 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:18,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-20 00:45:18,305 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:18,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-20 00:45:18,305 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:18,371 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:18,371 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:18,379 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:18,407 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:18,407 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:18,407 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,413 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:18,456 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:18,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:18,571 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80832bfa0> has no local changes
2024-05-20 00:45:18,571 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:18,581 [ scc.git] DEBUG [detached HEAD 9f403f6] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:18,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:18,582 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:18,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-20 00:45:18,764 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:18,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-20 00:45:18,764 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:18,829 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:18,829 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:18,835 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:18,904 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:18,905 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:18,905 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,911 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:18,959 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:18,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:18,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:19,006 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:19,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8082edf70> has no local changes
2024-05-20 00:45:19,082 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:19,092 [ scc.git] DEBUG [detached HEAD c91b9f0] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:19,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:19,093 [ scc.git] INFO Overriding base-branch from master to main
2024-05-20 00:45:19,093 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:19,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-20 00:45:19,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-20 00:45:20,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-20 00:45:20,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-20 00:45:21,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-20 00:45:21,610 [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-20 00:45:22,118 [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-20 00:45:22,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-20 00:45:23,011 [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-20 00:45:23,012 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-20 00:45:23,013 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:23,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-20 00:45:23,013 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:23,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:23,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-20 00:45:23,122 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:23,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-20 00:45:23,128 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-20 00:45:23,145 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:23,145 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-20 00:45:23,526 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-20 00:45:23,527 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-20 00:45:23,533 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:23,533 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:23,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:23,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-20 00:45:23,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:23,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-20 00:45:23,598 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-20 00:45:23,599 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-20 00:45:23,599 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:45:23,599 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:45:23,605 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-20 00:45:23,613 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-20 00:45:23,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:23,781 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-20 00:45:23,787 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-20 00:45:23,795 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-20 00:45:23,823 [ scc.config] DEBUG Found github.token
2024-05-20 00:45:23,824 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-20 00:45:23,824 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:23,877 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:23,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:23,884 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:23,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:24,012 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8082c9220> has no local changes
2024-05-20 00:45:24,012 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:24,021 [ scc.git] DEBUG [detached HEAD da00f3d] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:24,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:24,022 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:24,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-20 00:45:24,213 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:24,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-20 00:45:24,214 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:24,332 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:24,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:24,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:24,367 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:24,367 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:24,368 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,373 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:24,416 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:24,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:24,506 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8082d7e50> has no local changes
2024-05-20 00:45:24,507 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:24,516 [ scc.git] DEBUG [detached HEAD 8093666] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:24,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:24,516 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:24,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-20 00:45:24,693 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:24,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-20 00:45:24,694 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:24,887 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:24,887 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:24,894 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:24,931 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:24,932 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:24,932 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,937 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:24,978 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:24,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:24,984 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:25,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:25,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808210940> has no local changes
2024-05-20 00:45:25,107 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:25,117 [ scc.git] DEBUG [detached HEAD 741fb28] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:25,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:25,118 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:25,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-20 00:45:25,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-20 00:45:26,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-20 00:45:26,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-20 00:45:27,272 [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-20 00:45:27,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-20 00:45:28,194 [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-20 00:45:28,195 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-20 00:45:28,195 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:28,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-20 00:45:28,195 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:28,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:28,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-20 00:45:28,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:28,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-20 00:45:28,281 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-20 00:45:28,310 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:28,310 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-20 00:45:28,718 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-20 00:45:28,718 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-20 00:45:28,723 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:28,723 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:28,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:28,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-20 00:45:28,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:28,744 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-20 00:45:28,803 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-20 00:45:28,803 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-20 00:45:28,803 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:45:28,804 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:45:28,812 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-20 00:45:28,820 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-20 00:45:28,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:28,998 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-20 00:45:29,004 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-20 00:45:29,009 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-20 00:45:29,015 [ scc.config] DEBUG Found github.token
2024-05-20 00:45:29,015 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-20 00:45:29,015 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:29,055 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:29,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:29,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:29,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:29,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808274310> has no local changes
2024-05-20 00:45:29,181 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:29,191 [ scc.git] DEBUG [detached HEAD 031c93c] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:29,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:29,192 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-20 00:45:29,192 [ scc.repo] DEBUG ## PRs found:
2024-05-20 00:45:29,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-20 00:45:29,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-20 00:45:30,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-20 00:45:30,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-20 00:45:31,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-20 00:45:31,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-20 00:45:32,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-20 00:45:32,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-20 00:45:33,209 [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-20 00:45:33,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-20 00:45:34,064 [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-20 00:45:34,066 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-20 00:45:34,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-20 00:45:35,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-20 00:45:35,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-20 00:45:36,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-20 00:45:36,017 [ scc.repo] DEBUG ## Branches found:
2024-05-20 00:45:36,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-20 00:45:36,018 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:36,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:36,079 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-20 00:45:36,090 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-20 00:45:36,091 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-20 00:45:36,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-20 00:45:36,156 [ scc.git] DEBUG Already up to date.
2024-05-20 00:45:36,157 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-20 00:45:36,598 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-20 00:45:36,598 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-20 00:45:36,604 [ scc.git] DEBUG ## Unique users: []
2024-05-20 00:45:36,604 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:36,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:36,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-20 00:45:36,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:36,622 [ 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-20 00:45:36,683 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-20 00:45:36,684 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-20 00:45:36,684 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-20 00:45:36,684 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-20 00:45:36,691 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-20 00:45:36,699 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-20 00:45:36,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:36,856 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-20 00:45:36,866 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-20 00:45:36,875 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#71](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-20 00:45:36,882 [ scc.config] DEBUG Found github.token
2024-05-20 00:45:36,882 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-20 00:45:36,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-20 00:45:36,931 [ scc.git] DEBUG Get sha1 of %s
2024-05-20 00:45:36,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-20 00:45:36,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:36,980 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:37,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd808210bb0> has no local changes
2024-05-20 00:45:37,030 [ 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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:37,040 [ scc.git] DEBUG [detached HEAD 7d8221a] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:37,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:37,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-20 00:45:37,261 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-20 00:45:37,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:37,437 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-20 00:45:37,442 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-20 00:45:37,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:37,846 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-20 00:45:37,852 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-20 00:45:38,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:38,262 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-20 00:45:38,267 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-20 00:45:38,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:38,683 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-20 00:45:39,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:39,088 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-20 00:45:39,093 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-20 00:45:39,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:39,500 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-20 00:45:39,506 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-20 00:45:39,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:39,951 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-20 00:45:39,956 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-20 00:45:40,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:40,364 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-20 00:45:40,370 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-20 00:45:40,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:40,773 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-20 00:45:40,779 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-20 00:45:41,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:41,182 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-20 00:45:41,187 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-20 00:45:41,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:41,593 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-20 00:45:41,598 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-20 00:45:41,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:42,009 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-20 00:45:42,015 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-20 00:45:42,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:42,423 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-20 00:45:42,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:42,836 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-20 00:45:43,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:43,250 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-20 00:45:43,256 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-20 00:45:43,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:43,676 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-20 00:45:44,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:44,102 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-20 00:45:44,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:44,511 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-20 00:45:44,517 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-20 00:45:44,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:44,908 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-20 00:45:44,914 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-20 00:45:45,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:45,315 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-20 00:45:45,323 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-20 00:45:45,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:45,715 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-20 00:45:45,722 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-20 00:45:46,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-20 00:45:46,131 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-20 00:45:46,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-20 00:45:47,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd80b832460> has local changes
2024-05-20 00:45:47,251 [ 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 560 will-moore 'Max projection bytes' (status: failure)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 475 will-moore 'Update build and publish in gha'
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#71 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/71/)'
2024-05-20 00:45:47,279 [ scc.git] DEBUG [detached HEAD e05f349] merge master -Dorg -Ssuccess-only
2024-05-20 00:45:47,280 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-20 00:45:47,280 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-20 00:45:47,280 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-20 00:45:47,280 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-20 00:45:47,280 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,280 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-20 00:45:47,280 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,280 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-20 00:45:47,280 [ scc.merge] INFO
2024-05-20 00:45:47,280 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-20 00:45:47,281 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-20 00:45:47,281 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-20 00:45:47,281 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (status: failure)
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-20 00:45:47,281 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-20 00:45:47,281 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,281 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,281 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-20 00:45:47,281 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-20 00:45:47,282 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-20 00:45:47,282 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 475 will-moore 'Update build and publish in gha'
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-20 00:45:47,282 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-20 00:45:47,282 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-20 00:45:47,282 [ scc.merge] INFO
2024-05-20 00:45:47,282 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-20 00:45:47,282 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-20 00:45:47,282 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-20 00:45:47,283 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Merged PRs:
2024-05-20 00:45:47,283 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-20 00:45:47,283 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,283 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-20 00:45:47,284 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-20 00:45:47,284 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-20 00:45:47,284 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-20 00:45:47,284 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-20 00:45:47,284 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Repository: ome/scripts
2024-05-20 00:45:47,284 [ scc.merge] INFO Excluded PRs:
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-20 00:45:47,284 [ scc.merge] INFO Already up to date.
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-20 00:45:47,284 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-20 00:45:47,284 [ scc.merge] INFO
2024-05-20 00:45:47,284 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-20 00:45:47,284 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-20 00:45:47,290 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-20 00:45:47,295 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-20 00:45:47,300 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-20 00:45:47,305 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-20 00:45:47,310 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-20 00:45:47,314 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-20 00:45:47,319 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-20 00:45:47,324 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-20 00:45:47,329 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-20 00:45:47,334 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-20 00:45:47,339 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-20 00:45:47,344 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-20 00:45:47,349 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-20 00:45:47,353 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-20 00:45:47,358 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-20 00:45:47,363 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-20 00:45:47,368 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-20 00:45:47,373 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-20 00:45:47,378 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-20 00:45:47,383 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-20 00:45:47,389 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-20 00:45:47,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-20 00:45:47,394 [ scc.git] DEBUG Calling 'git remote'
2024-05-20 00:45:47,398 [ 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 4f0043b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3d9e3b87
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 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 516c4ea] 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-20 00:46:41,528 [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-20 00:46:50,516 [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-20 00:46:52,871 [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-20 00:46:57,447 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-20 00:47:44,008 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
