Skipping 105 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-03 00:44:44,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:44:44,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30200970> has no local changes
2024-07-03 00:44:44,508 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:44:44,518 [ scc.git] DEBUG [detached HEAD 0e2e0ba] merge master -Dorg -Ssuccess-only
2024-07-03 00:44:44,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:44:44,518 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:44:44,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-07-03 00:44:45,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-07-03 00:44:45,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-07-03 00:44:46,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-03 00:44:46,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-03 00:44:47,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-03 00:44:47,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-03 00:44:48,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:44:48,253 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-03 00:44:48,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-07-03 00:44:49,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-07-03 00:44:49,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-03 00:44:50,162 [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-07-03 00:44:50,649 [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-07-03 00:44:51,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-03 00:44:51,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:44:51,528 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-07-03 00:44:52,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-07-03 00:44:52,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-03 00:44:52,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-03 00:44:53,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-03 00:44:53,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-03 00:44:54,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:44:54,371 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-03 00:44:54,371 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:44:54,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-03 00:44:54,371 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:44:54,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:54,378 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:44:54,384 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:44:54,385 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:44:54,392 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:44:54,404 [ scc.git] DEBUG Updating 9ffbc8b7..86981348
2024-07-03 00:44:55,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/572 HTTP/1.1" 200 None
2024-07-03 00:44:55,105 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-03 00:44:56,341 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-03 00:44:56,342 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-03 00:44:56,345 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-03 00:44:56,889 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-03 00:44:56,889 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-03 00:44:56,895 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-03 00:44:57,305 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-03 00:44:57,306 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-03 00:44:57,311 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:44:57,311 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:44:57,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:57,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-03 00:44:57,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:57,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-03 00:44:57,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-03 00:44:57,355 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-03 00:44:57,358 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-03 00:44:57,358 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-03 00:44:57,358 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-03 00:44:57,358 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-03 00:44:57,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:44:57,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-03 00:44:57,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:57,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-03 00:44:57,563 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-03 00:44:57,563 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-03 00:44:57,563 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-03 00:44:57,564 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:44:57,571 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-03 00:44:57,571 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-03 00:44:57,571 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-03 00:44:57,571 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-03 00:44:57,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:44:57,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-03 00:44:57,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:57,949 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-03 00:44:57,970 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:44:57,973 [ scc.git] DEBUG setup.py | 2 +-
2024-07-03 00:44:57,973 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-03 00:44:58,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:44:58,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:44:58,399 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:44:58,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:44:58,407 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:44:58,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:44:58,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b301bbbb0> has no local changes
2024-07-03 00:44:58,468 [ 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' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9ffbc8b7..86981348
Previously merged:
- PR 572 sbesson 'Remove the maximum reportlab version from the readme'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:44:58,481 [ scc.git] DEBUG [detached HEAD aa3c7c68] merge master -Dorg -Ssuccess-only
2024-07-03 00:44:58,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:44:58,482 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:44:58,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-03 00:44:59,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-03 00:44:59,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-03 00:45:00,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-03 00:45:00,754 [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-07-03 00:45:01,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-03 00:45:01,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:01,724 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-03 00:45:01,725 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:01,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-03 00:45:01,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:01,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:01,733 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:01,740 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:01,740 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:01,748 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:01,755 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:01,756 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-03 00:45:02,184 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-03 00:45:02,185 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-03 00:45:02,189 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:02,189 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:02,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:02,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-03 00:45:02,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:02,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-03 00:45:02,232 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-03 00:45:02,233 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:02,235 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-03 00:45:02,235 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-03 00:45:02,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:02,413 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:02,454 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:02,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:02,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:02,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:02,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b3016a1c0> has no local changes
2024-07-03 00:45:02,507 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:02,516 [ scc.git] DEBUG [detached HEAD 9087d4b] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:02,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:02,517 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:02,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-03 00:45:03,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-03 00:45:03,366 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:03,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-03 00:45:04,508 [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-07-03 00:45:05,094 [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-07-03 00:45:05,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-03 00:45:06,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:06,070 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-03 00:45:06,071 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:06,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-03 00:45:06,071 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:06,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:06,078 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:06,086 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:06,086 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:06,096 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:06,105 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:06,106 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-03 00:45:06,506 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-03 00:45:06,506 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-03 00:45:06,511 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:06,512 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:06,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:06,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-03 00:45:06,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:06,534 [ 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-07-03 00:45:06,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:06,554 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-03 00:45:06,554 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-03 00:45:06,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:06,720 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:06,771 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:06,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:06,777 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:06,822 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:06,830 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b301fdfa0> has no local changes
2024-07-03 00:45:06,830 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:06,840 [ scc.git] DEBUG [detached HEAD a23c31a] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:06,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:06,841 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:07,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-03 00:45:07,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-03 00:45:07,780 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:08,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-03 00:45:08,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-03 00:45:09,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-03 00:45:10,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-03 00:45:10,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:10,518 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-03 00:45:10,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-03 00:45:10,996 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:11,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-03 00:45:12,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-03 00:45:12,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-03 00:45:13,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-03 00:45:13,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:13,489 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-03 00:45:13,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-03 00:45:14,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-03 00:45:14,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-03 00:45:15,400 [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-07-03 00:45:15,890 [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-07-03 00:45:16,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-03 00:45:16,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:16,811 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-03 00:45:17,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-03 00:45:17,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-03 00:45:18,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-03 00:45:18,761 [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-07-03 00:45:19,224 [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-07-03 00:45:19,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-03 00:45:20,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:20,144 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-03 00:45:20,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-03 00:45:21,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-03 00:45:21,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-03 00:45:22,234 [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-07-03 00:45:22,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-03 00:45:23,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:23,075 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-03 00:45:23,075 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:23,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-03 00:45:23,076 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:23,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:23,086 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:23,097 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:23,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:23,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:23,119 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:23,120 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-03 00:45:23,572 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-03 00:45:23,572 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-03 00:45:23,582 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-03 00:45:23,998 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-03 00:45:23,999 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-03 00:45:24,005 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-03 00:45:24,476 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-03 00:45:24,477 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-03 00:45:24,484 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-03 00:45:24,852 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-03 00:45:24,852 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-03 00:45:24,862 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-03 00:45:25,245 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-03 00:45:25,246 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-03 00:45:25,252 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:25,252 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:25,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:25,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-03 00:45:25,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:25,275 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-03 00:45:25,361 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-03 00:45:25,363 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:25,369 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-03 00:45:25,369 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-03 00:45:25,369 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-03 00:45:25,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:25,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-03 00:45:25,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:25,562 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-03 00:45:25,744 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-03 00:45:25,744 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-03 00:45:25,745 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-03 00:45:25,745 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-03 00:45:25,745 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:25,751 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-03 00:45:25,751 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-03 00:45:25,751 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-03 00:45:25,751 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-03 00:45:25,751 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-03 00:45:25,751 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-03 00:45:25,751 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-03 00:45:25,751 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-03 00:45:25,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:25,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-03 00:45:25,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:25,993 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-03 00:45:26,046 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-03 00:45:26,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:26,051 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-03 00:45:26,051 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-03 00:45:26,052 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-03 00:45:26,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:26,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-03 00:45:26,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:26,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-03 00:45:26,437 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:26,451 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-03 00:45:26,452 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-03 00:45:26,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:26,796 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-03 00:45:26,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:26,825 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-03 00:45:26,862 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-03 00:45:26,863 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:27,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:27,198 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:27,243 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:27,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:27,252 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:27,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:27,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30176340> has no local changes
2024-07-03 00:45:27,306 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:27,318 [ scc.git] DEBUG [detached HEAD 100b121] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:27,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:27,318 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:27,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-03 00:45:28,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-03 00:45:28,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-03 00:45:29,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-03 00:45:29,709 [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-07-03 00:45:30,218 [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-07-03 00:45:30,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-03 00:45:31,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:31,203 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-03 00:45:31,204 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:31,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-03 00:45:31,204 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:31,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:31,212 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:31,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:31,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:31,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:31,234 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:31,234 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-03 00:45:31,617 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-03 00:45:31,618 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-03 00:45:31,627 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:31,627 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:31,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:31,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-03 00:45:31,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:31,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-03 00:45:31,669 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:31,672 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-03 00:45:31,672 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-03 00:45:31,672 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-03 00:45:31,672 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-03 00:45:31,673 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-03 00:45:31,673 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-03 00:45:31,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:31,831 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:31,886 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:31,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:31,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:31,959 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:31,972 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30187b80> has no local changes
2024-07-03 00:45:31,973 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:31,988 [ scc.git] DEBUG [detached HEAD 76fe042] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:31,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:31,988 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:32,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-03 00:45:32,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-03 00:45:33,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-03 00:45:33,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-03 00:45:34,347 [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-07-03 00:45:34,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-03 00:45:35,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:35,290 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-03 00:45:35,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-03 00:45:36,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-03 00:45:36,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-03 00:45:37,207 [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-07-03 00:45:37,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-03 00:45:38,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:38,067 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-03 00:45:38,067 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:38,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-03 00:45:38,067 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:38,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:38,075 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:38,082 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:38,082 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:38,089 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:38,096 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:38,097 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-03 00:45:38,601 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-03 00:45:38,602 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-03 00:45:38,609 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-03 00:45:39,130 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-03 00:45:39,130 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-03 00:45:39,135 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:39,135 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:39,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:39,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-03 00:45:39,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:39,156 [ 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-07-03 00:45:39,203 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-03 00:45:39,203 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-03 00:45:39,203 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-03 00:45:39,203 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-03 00:45:39,203 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:45:39,203 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:45:39,212 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-03 00:45:39,222 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-03 00:45:39,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:39,394 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-03 00:45:39,406 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-03 00:45:39,415 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-07-03 00:45:39,423 [ scc.config] DEBUG Found github.token
2024-07-03 00:45:39,423 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-03 00:45:39,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-03 00:45:39,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:39,440 [ 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-07-03 00:45:39,464 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-03 00:45:39,464 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-03 00:45:39,464 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-03 00:45:39,464 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:45:39,465 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:45:39,475 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-03 00:45:39,486 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-03 00:45:39,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:39,805 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-03 00:45:39,820 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-03 00:45:39,832 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/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-07-03 00:45:39,840 [ scc.config] DEBUG Found github.token
2024-07-03 00:45:39,840 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-03 00:45:39,841 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:39,893 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:39,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:39,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:39,953 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:39,962 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b301c1cd0> has no local changes
2024-07-03 00:45:39,963 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:39,974 [ scc.git] DEBUG [detached HEAD ef5cc0b] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:39,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:39,975 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:40,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-03 00:45:40,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-03 00:45:40,859 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:41,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-03 00:45:42,190 [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-07-03 00:45:42,687 [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-07-03 00:45:43,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-03 00:45:43,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:43,686 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-03 00:45:44,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-03 00:45:44,158 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:44,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-03 00:45:45,261 [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-07-03 00:45:45,764 [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-07-03 00:45:46,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-03 00:45:46,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:46,718 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-03 00:45:47,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-03 00:45:47,193 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-03 00:45:47,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-03 00:45:48,295 [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-07-03 00:45:48,804 [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-07-03 00:45:49,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-03 00:45:49,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:45:49,759 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-03 00:45:50,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-03 00:45:50,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-03 00:45:51,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-03 00:45:51,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-03 00:45:52,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-03 00:45:52,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-03 00:45:52,609 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:52,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-03 00:45:52,610 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:52,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:52,619 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:52,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:52,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:52,640 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:52,651 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:52,652 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-03 00:45:53,076 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-03 00:45:53,077 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-03 00:45:53,083 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-03 00:45:53,544 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-03 00:45:53,544 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-03 00:45:53,551 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-03 00:45:53,946 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-03 00:45:53,946 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-03 00:45:53,954 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:53,954 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:53,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:53,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-03 00:45:53,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:53,982 [ 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-07-03 00:45:53,995 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:53,999 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-03 00:45:53,999 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-03 00:45:54,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:54,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-03 00:45:54,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:54,176 [ 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-07-03 00:45:54,230 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-03 00:45:54,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:54,236 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-03 00:45:54,236 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-03 00:45:54,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:54,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-03 00:45:54,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:54,587 [ 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-07-03 00:45:54,616 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-03 00:45:54,617 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:54,624 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-03 00:45:54,624 [ scc.git] DEBUG package.json | 2 +-
2024-07-03 00:45:54,624 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-03 00:45:54,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:54,972 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:55,029 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:55,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:55,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:55,097 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:55,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b301e2e50> has no local changes
2024-07-03 00:45:55,107 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:55,122 [ scc.git] DEBUG [detached HEAD c14e6e3] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:55,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:55,123 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:55,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-03 00:45:55,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-03 00:45:56,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-03 00:45:56,976 [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-07-03 00:45:57,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-03 00:45:58,019 [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-07-03 00:45:58,020 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-03 00:45:58,020 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:45:58,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-03 00:45:58,021 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:58,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:58,037 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:45:58,047 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:45:58,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:45:58,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:45:58,079 [ scc.git] DEBUG Already up to date.
2024-07-03 00:45:58,080 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-03 00:45:58,497 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-03 00:45:58,498 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-03 00:45:58,504 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:45:58,504 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:58,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:58,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-03 00:45:58,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:58,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-03 00:45:58,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:45:58,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:45:58,724 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:45:58,777 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:45:58,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:45:58,787 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:45:58,844 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:45:58,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30140fd0> has no local changes
2024-07-03 00:45:58,853 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:45:58,865 [ scc.git] DEBUG [detached HEAD 1742343] merge master -Dorg -Ssuccess-only
2024-07-03 00:45:58,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:45:58,866 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:45:59,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-03 00:45:59,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-03 00:46:00,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-03 00:46:00,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-03 00:46:01,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-03 00:46:01,617 [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-07-03 00:46:02,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-03 00:46:02,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:46:02,495 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-03 00:46:02,495 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:02,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-03 00:46:02,495 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:02,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:02,503 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:02,509 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:02,509 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:02,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:02,524 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:02,524 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-03 00:46:03,045 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-03 00:46:03,045 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-03 00:46:03,052 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:03,052 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:03,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:03,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-03 00:46:03,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:03,085 [ 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-07-03 00:46:03,098 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-03 00:46:03,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:46:03,101 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-03 00:46:03,101 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-03 00:46:03,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:03,266 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:03,309 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:03,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:03,317 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:03,364 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:03,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b300f9580> has no local changes
2024-07-03 00:46:03,376 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:03,388 [ scc.git] DEBUG [detached HEAD 4fb56ca] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:03,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:03,389 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:03,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-03 00:46:04,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-03 00:46:04,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-03 00:46:05,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-03 00:46:05,727 [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-07-03 00:46:06,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-03 00:46:06,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:46:06,579 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-03 00:46:06,579 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:06,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-03 00:46:06,579 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:06,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:06,587 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:06,595 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:06,596 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:06,605 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:06,614 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:06,614 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-03 00:46:07,042 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-03 00:46:07,042 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-03 00:46:07,048 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:07,048 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:07,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:07,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-03 00:46:07,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:07,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-03 00:46:07,093 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-03 00:46:07,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-03 00:46:07,093 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-03 00:46:07,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-03 00:46:07,093 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-03 00:46:07,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-03 00:46:07,094 [ scc.git] DEBUG Auto-merging setup.py
2024-07-03 00:46:07,094 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-03 00:46:07,094 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:46:07,094 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:46:07,103 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-03 00:46:07,113 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-03 00:46:07,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:07,279 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-03 00:46:07,286 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-03 00:46:07,294 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-07-03 00:46:07,301 [ scc.config] DEBUG Found github.token
2024-07-03 00:46:07,301 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-03 00:46:07,302 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:07,346 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:07,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:07,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:07,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:07,404 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30179e80> has no local changes
2024-07-03 00:46:07,404 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:07,416 [ scc.git] DEBUG [detached HEAD e445552] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:07,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:07,416 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:07,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-03 00:46:08,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-03 00:46:08,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-03 00:46:09,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-03 00:46:09,666 [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-07-03 00:46:10,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-03 00:46:10,526 [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-07-03 00:46:10,527 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-03 00:46:10,527 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:10,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-03 00:46:10,527 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:10,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:10,536 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:10,544 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:10,545 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:10,559 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:10,570 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:10,571 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-03 00:46:11,105 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-03 00:46:11,106 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-03 00:46:11,111 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:11,111 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:11,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,120 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-03 00:46:11,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,140 [ 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-07-03 00:46:11,180 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-03 00:46:11,184 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-03 00:46:11,184 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-03 00:46:11,184 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-03 00:46:11,184 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-03 00:46:11,184 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-03 00:46:11,186 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-03 00:46:11,187 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-03 00:46:11,187 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-03 00:46:11,187 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-03 00:46:11,188 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-03 00:46:11,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:11,359 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:11,408 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:11,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:11,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:11,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b300f9730> has no local changes
2024-07-03 00:46:11,492 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:11,511 [ scc.git] DEBUG [detached HEAD 7b39c76] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:11,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:11,512 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:11,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-03 00:46:11,793 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:11,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-03 00:46:11,793 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:11,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,809 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:11,825 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:11,826 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:11,842 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:11,856 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:11,857 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:11,857 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:11,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,867 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:11,973 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:11,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:11,982 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:12,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:12,064 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b3010abe0> has no local changes
2024-07-03 00:46:12,065 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:12,083 [ scc.git] DEBUG [detached HEAD 60cbaae] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:12,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:12,086 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:12,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-03 00:46:12,258 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:12,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-03 00:46:12,259 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:12,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:12,268 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:12,275 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:12,276 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:12,284 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:12,293 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:12,293 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:12,293 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:12,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:12,300 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:12,347 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:12,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:12,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:12,402 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:12,411 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30167370> has no local changes
2024-07-03 00:46:12,412 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:12,426 [ scc.git] DEBUG [detached HEAD 912b8bc] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:12,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:12,427 [ scc.git] INFO Overriding base-branch from master to main
2024-07-03 00:46:12,427 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:12,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-03 00:46:13,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-03 00:46:13,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-03 00:46:14,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-03 00:46:14,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-03 00:46:15,281 [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-07-03 00:46:15,755 [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-07-03 00:46:16,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-03 00:46:16,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:46:16,702 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-03 00:46:16,703 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:16,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-03 00:46:16,703 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:16,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:16,712 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-03 00:46:16,720 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:16,721 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-03 00:46:16,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-03 00:46:16,740 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:16,740 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-03 00:46:17,192 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-03 00:46:17,192 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-03 00:46:17,197 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:17,198 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:17,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-03 00:46:17,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-03 00:46:17,235 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-03 00:46:17,235 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-03 00:46:17,235 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:46:17,236 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:46:17,244 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-03 00:46:17,257 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-03 00:46:17,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:17,425 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-03 00:46:17,432 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-03 00:46:17,439 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-03 00:46:17,445 [ scc.config] DEBUG Found github.token
2024-07-03 00:46:17,446 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-03 00:46:17,446 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:17,490 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:17,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,498 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:17,542 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:17,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b3015fd90> has no local changes
2024-07-03 00:46:17,551 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:17,563 [ scc.git] DEBUG [detached HEAD 2249493] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:17,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:17,564 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:17,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-03 00:46:17,860 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:17,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-03 00:46:17,860 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:17,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:17,876 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:17,876 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:17,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:17,893 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:17,894 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:17,894 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:17,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,902 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:17,949 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:17,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:17,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:18,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:18,015 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30105eb0> has no local changes
2024-07-03 00:46:18,016 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:18,026 [ scc.git] DEBUG [detached HEAD 5c5f205] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:18,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:18,027 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:18,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-03 00:46:18,289 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:18,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-03 00:46:18,289 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:18,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:18,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:18,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:18,312 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:18,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:18,333 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:18,333 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:18,333 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:18,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:18,344 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:18,397 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:18,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:18,408 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:18,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:18,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30073520> has no local changes
2024-07-03 00:46:18,466 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:18,476 [ scc.git] DEBUG [detached HEAD 25a067a] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:18,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:18,477 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:18,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-03 00:46:19,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-03 00:46:19,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-03 00:46:20,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-03 00:46:20,623 [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-07-03 00:46:21,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-03 00:46:21,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:46:21,614 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-03 00:46:21,614 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:21,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-03 00:46:21,614 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:21,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:21,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-03 00:46:21,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:21,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-03 00:46:21,647 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-03 00:46:21,658 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:21,658 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-03 00:46:22,073 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-03 00:46:22,074 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-03 00:46:22,081 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:22,081 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:22,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:22,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-03 00:46:22,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:22,116 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-03 00:46:22,135 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-03 00:46:22,135 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-03 00:46:22,135 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:46:22,136 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:46:22,145 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-03 00:46:22,155 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-03 00:46:22,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:22,314 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-03 00:46:22,324 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-03 00:46:22,334 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-03 00:46:22,345 [ scc.config] DEBUG Found github.token
2024-07-03 00:46:22,346 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-03 00:46:22,346 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:22,417 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:22,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:22,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:22,531 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:22,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b300b9be0> has no local changes
2024-07-03 00:46:22,560 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:22,591 [ scc.git] DEBUG [detached HEAD d13e445] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:22,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:22,593 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-03 00:46:22,593 [ scc.repo] DEBUG ## PRs found:
2024-07-03 00:46:22,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-03 00:46:23,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-03 00:46:23,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-03 00:46:24,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-03 00:46:24,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-03 00:46:25,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-03 00:46:25,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-03 00:46:26,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-03 00:46:26,786 [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-07-03 00:46:27,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-03 00:46:27,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-03 00:46:27,641 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-03 00:46:28,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-03 00:46:28,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-03 00:46:29,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-03 00:46:29,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-03 00:46:29,593 [ scc.repo] DEBUG ## Branches found:
2024-07-03 00:46:29,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-03 00:46:29,593 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:29,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:29,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-03 00:46:29,610 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-03 00:46:29,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-03 00:46:29,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-03 00:46:29,633 [ scc.git] DEBUG Already up to date.
2024-07-03 00:46:29,633 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-03 00:46:30,162 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-03 00:46:30,163 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-03 00:46:30,170 [ scc.git] DEBUG ## Unique users: []
2024-07-03 00:46:30,171 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:30,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:30,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-03 00:46:30,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:30,203 [ 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-07-03 00:46:30,279 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-03 00:46:30,279 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-03 00:46:30,279 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-03 00:46:30,280 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-03 00:46:30,289 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-03 00:46:30,303 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-03 00:46:30,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:30,466 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-03 00:46:30,476 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-03 00:46:30,489 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#114](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-03 00:46:30,501 [ scc.config] DEBUG Found github.token
2024-07-03 00:46:30,502 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-03 00:46:30,502 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-03 00:46:30,578 [ scc.git] DEBUG Get sha1 of %s
2024-07-03 00:46:30,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-03 00:46:30,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:30,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:30,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b300733d0> has no local changes
2024-07-03 00:46:30,680 [ 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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:30,695 [ scc.git] DEBUG [detached HEAD 578596a] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:30,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:30,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-03 00:46:30,837 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-03 00:46:31,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:31,023 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-03 00:46:31,036 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-03 00:46:31,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:31,454 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-03 00:46:31,464 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-03 00:46:31,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:31,860 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-03 00:46:31,873 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-03 00:46:32,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:32,284 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-03 00:46:32,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:32,690 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-03 00:46:32,702 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-03 00:46:33,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:33,102 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-03 00:46:33,118 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-03 00:46:33,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:33,511 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-03 00:46:33,519 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-03 00:46:33,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:33,923 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-03 00:46:33,931 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-03 00:46:34,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:34,335 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-03 00:46:34,342 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-03 00:46:34,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:34,833 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-03 00:46:34,842 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-03 00:46:35,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:35,252 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-03 00:46:35,263 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-03 00:46:35,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:35,671 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-03 00:46:35,679 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-03 00:46:36,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:36,093 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-03 00:46:36,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:36,510 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-03 00:46:36,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:36,938 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-03 00:46:36,950 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-03 00:46:37,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:37,344 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-03 00:46:37,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:37,758 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-03 00:46:38,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:38,173 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-03 00:46:38,184 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-03 00:46:38,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:38,592 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-03 00:46:38,601 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-03 00:46:38,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:39,013 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-03 00:46:39,026 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-03 00:46:39,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:39,432 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-03 00:46:39,439 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-03 00:46:39,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-03 00:46:39,838 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-03 00:46:39,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-03 00:46:39,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b30b10460> has local changes
2024-07-03 00:46:39,919 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 378 dependabot[bot] 'Bump scripts from `5a90893` to `c20d273`'
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'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
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' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9ffbc8b7..86981348
Previously merged:
- PR 572 sbesson 'Remove the maximum reportlab version from the readme'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
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#114 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/114/)'
2024-07-03 00:46:39,935 [ scc.git] DEBUG [detached HEAD 361fd0a] merge master -Dorg -Ssuccess-only
2024-07-03 00:46:39,935 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-03 00:46:39,935 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-03 00:46:39,935 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,935 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 378 dependabot[bot] 'Bump scripts from `5a90893` to `c20d273`'
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-03 00:46:39,936 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-03 00:46:39,936 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-03 00:46:39,936 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-03 00:46:39,936 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-03 00:46:39,936 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-03 00:46:39,936 [ scc.merge] INFO
2024-07-03 00:46:39,936 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-03 00:46:39,936 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,936 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-03 00:46:39,937 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-03 00:46:39,937 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-03 00:46:39,937 [ scc.merge] INFO Updating 9ffbc8b7..86981348
2024-07-03 00:46:39,937 [ scc.merge] INFO Previously merged:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 572 sbesson 'Remove the maximum reportlab version from the readme'
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-03 00:46:39,937 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-03 00:46:39,937 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,937 [ scc.merge] INFO
2024-07-03 00:46:39,937 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,937 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-03 00:46:39,938 [ scc.merge] INFO
2024-07-03 00:46:39,938 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-03 00:46:39,938 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-03 00:46:39,938 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,938 [ scc.merge] INFO
2024-07-03 00:46:39,938 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-03 00:46:39,938 [ scc.merge] INFO
2024-07-03 00:46:39,938 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-03 00:46:39,938 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-03 00:46:39,938 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,938 [ scc.merge] INFO
2024-07-03 00:46:39,938 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,938 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-03 00:46:39,939 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-03 00:46:39,939 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-03 00:46:39,939 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-03 00:46:39,939 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-03 00:46:39,939 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-03 00:46:39,939 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,939 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,939 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-03 00:46:39,939 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,940 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Merged PRs:
2024-07-03 00:46:39,940 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-03 00:46:39,940 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,940 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,940 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-03 00:46:39,940 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,940 [ scc.merge] INFO
2024-07-03 00:46:39,941 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-03 00:46:39,941 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,941 [ scc.merge] INFO
2024-07-03 00:46:39,941 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-03 00:46:39,941 [ scc.merge] INFO
2024-07-03 00:46:39,941 [ scc.merge] INFO Repository: ome/scripts
2024-07-03 00:46:39,941 [ scc.merge] INFO Excluded PRs:
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-03 00:46:39,941 [ scc.merge] INFO Already up to date.
2024-07-03 00:46:39,941 [ scc.merge] INFO
2024-07-03 00:46:39,941 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-03 00:46:39,941 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-03 00:46:39,941 [ scc.merge] INFO
2024-07-03 00:46:39,941 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-03 00:46:39,941 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-03 00:46:39,948 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-03 00:46:39,953 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-03 00:46:39,958 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-03 00:46:39,964 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-03 00:46:39,969 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-03 00:46:39,974 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-03 00:46:39,980 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-03 00:46:39,987 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-03 00:46:39,993 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:39,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:39,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-03 00:46:39,999 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-03 00:46:40,006 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-03 00:46:40,012 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-03 00:46:40,018 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-03 00:46:40,025 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-03 00:46:40,031 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-03 00:46:40,040 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-03 00:46:40,047 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-03 00:46:40,054 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-03 00:46:40,062 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-03 00:46:40,068 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-03 00:46:40,074 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-03 00:46:40,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-03 00:46:40,081 [ scc.git] DEBUG Calling 'git remote'
2024-07-03 00:46:40,087 [ 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 44bae46] 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 9ffbc8b7
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 a8f380f
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 cda3ec6
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 c20d273
nothing to commit, working tree clean
[detached HEAD 4c7c018] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-03 00:47:30,357 [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-07-03 00:47:39,385 [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-07-03 00:47:41,814 [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-07-03 00:47:46,370 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-03 00:48:37,230 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
