Skipping 102 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-04 00:44:56,994 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Updating 2ca566b..9b73dd9
Previously merged:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:44:57,004 [ scc.git] DEBUG [detached HEAD b334925] merge master -Dorg -Ssuccess-only
2024-07-04 00:44:57,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:44:57,005 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:44:57,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-07-04 00:44:57,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/575 HTTP/1.1" 200 None
2024-07-04 00:44:58,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-07-04 00:44:58,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-07-04 00:44:59,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-04 00:44:59,792 [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-04 00:45:00,262 [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-04 00:45:00,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-04 00:45:01,205 [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-04 00:45:01,206 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-04 00:45:01,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-07-04 00:45:02,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-07-04 00:45:02,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-04 00:45:03,153 [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-04 00:45:03,634 [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-04 00:45:04,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-04 00:45:04,497 [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-04 00:45:04,498 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-07-04 00:45:04,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-07-04 00:45:05,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-04 00:45:05,920 [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-04 00:45:06,386 [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-04 00:45:06,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-04 00:45:07,251 [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-04 00:45:07,252 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-04 00:45:07,252 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:07,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-04 00:45:07,252 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:07,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:07,258 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:07,265 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:07,266 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:07,274 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:07,287 [ scc.git] DEBUG Updating 86981348..64566080
2024-07-04 00:45:07,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/574 HTTP/1.1" 200 None
2024-07-04 00:45:07,872 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-04 00:45:08,363 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-04 00:45:08,363 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-04 00:45:08,369 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-04 00:45:09,097 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-04 00:45:09,097 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-04 00:45:09,103 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-04 00:45:09,704 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-04 00:45:09,704 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-04 00:45:09,710 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:09,710 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:09,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:09,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-04 00:45:09,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:09,731 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-04 00:45:09,786 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:09,792 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-04 00:45:09,793 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-04 00:45:09,793 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-04 00:45:09,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:09,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-04 00:45:09,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:09,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-04 00:45:10,073 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-04 00:45:10,073 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-04 00:45:10,073 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-04 00:45:10,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:10,080 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-04 00:45:10,080 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-04 00:45:10,080 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-04 00:45:10,081 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-04 00:45:10,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:10,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-04 00:45:10,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:10,389 [ 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-04 00:45:10,418 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:10,421 [ scc.git] DEBUG setup.py | 2 +-
2024-07-04 00:45:10,421 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-04 00:45:10,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:10,797 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:10,843 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:10,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:10,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:10,893 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:10,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4200bb0> has no local changes
2024-07-04 00:45:10,904 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 86981348..64566080
Previously merged:
- PR 574 Tom-TBT 'usePolling config for Vite auto refresh'
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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:10,917 [ scc.git] DEBUG [detached HEAD f138fdca] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:10,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:10,918 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:11,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-04 00:45:11,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-04 00:45:12,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-04 00:45:12,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-04 00:45:13,289 [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-04 00:45:13,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-04 00:45:14,164 [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-04 00:45:14,165 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-04 00:45:14,165 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:14,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-04 00:45:14,165 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:14,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:14,172 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:14,178 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:14,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:14,184 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:14,190 [ scc.git] DEBUG Already up to date.
2024-07-04 00:45:14,190 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-04 00:45:14,635 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-04 00:45:14,635 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-04 00:45:14,641 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:14,641 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:14,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:14,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-04 00:45:14,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:14,660 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-04 00:45:14,699 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-04 00:45:14,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:14,702 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-04 00:45:14,702 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-04 00:45:14,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:14,858 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:14,905 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:14,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:14,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:14,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:14,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd41b1670> has no local changes
2024-07-04 00:45:14,967 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:14,977 [ scc.git] DEBUG [detached HEAD 792a555] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:14,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:14,978 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:15,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-04 00:45:15,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-04 00:45:15,797 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:45:16,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-04 00:45:16,947 [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-04 00:45:17,482 [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-04 00:45:18,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-04 00:45:18,490 [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-04 00:45:18,491 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-04 00:45:18,491 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:18,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-04 00:45:18,491 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:18,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:18,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:18,504 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:18,505 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:18,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:18,518 [ scc.git] DEBUG Already up to date.
2024-07-04 00:45:18,518 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-04 00:45:18,989 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-04 00:45:18,989 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-04 00:45:18,995 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:18,996 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:18,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:19,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-04 00:45:19,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:19,028 [ 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-04 00:45:19,044 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:19,048 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-04 00:45:19,048 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-04 00:45:19,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:19,211 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:19,257 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:19,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:19,264 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:19,314 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:19,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4259fa0> has no local changes
2024-07-04 00:45:19,324 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:19,335 [ scc.git] DEBUG [detached HEAD a632a56] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:19,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:19,336 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:19,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-04 00:45:20,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-04 00:45:20,194 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:45:20,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-04 00:45:21,324 [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-04 00:45:21,809 [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-04 00:45:22,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-04 00:45:22,699 [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-04 00:45:22,700 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-04 00:45:23,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-04 00:45:23,153 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:45:23,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-04 00:45:24,193 [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-04 00:45:24,723 [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-04 00:45:25,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-04 00:45:25,565 [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-04 00:45:25,567 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-04 00:45:26,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-04 00:45:26,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-04 00:45:26,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-04 00:45:27,451 [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-04 00:45:27,924 [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-04 00:45:28,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-04 00:45:28,840 [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-04 00:45:28,841 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-04 00:45:29,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-04 00:45:29,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-04 00:45:30,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-04 00:45:30,733 [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-04 00:45:31,210 [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-04 00:45:31,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-04 00:45:32,150 [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-04 00:45:32,151 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-04 00:45:32,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-04 00:45:33,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-04 00:45:33,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-04 00:45:34,103 [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-04 00:45:34,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-04 00:45:35,030 [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-04 00:45:35,030 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-04 00:45:35,031 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:35,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-04 00:45:35,031 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:35,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:35,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:35,044 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:35,045 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:35,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:35,094 [ scc.git] DEBUG Already up to date.
2024-07-04 00:45:35,094 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-04 00:45:36,006 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-04 00:45:36,006 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-04 00:45:36,012 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-04 00:45:37,287 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-04 00:45:37,287 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-04 00:45:37,293 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-04 00:45:37,728 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-04 00:45:37,728 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-04 00:45:37,734 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-04 00:45:38,185 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-04 00:45:38,185 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-04 00:45:38,194 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-04 00:45:38,546 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-04 00:45:38,546 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-04 00:45:38,552 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:38,553 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:38,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:38,562 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-04 00:45:38,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:38,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-04 00:45:38,638 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-04 00:45:38,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:38,643 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-04 00:45:38,643 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-04 00:45:38,643 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-04 00:45:38,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:38,814 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-04 00:45:38,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:38,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-04 00:45:38,937 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-04 00:45:38,937 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-04 00:45:38,938 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-04 00:45:38,938 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-04 00:45:38,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:38,942 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-04 00:45:38,943 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-04 00:45:38,943 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-04 00:45:38,943 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-04 00:45:38,943 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-04 00:45:38,943 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-04 00:45:38,943 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-04 00:45:38,943 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-04 00:45:39,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:39,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-04 00:45:39,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:39,235 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-04 00:45:39,284 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-04 00:45:39,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:39,288 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-04 00:45:39,288 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-04 00:45:39,288 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-04 00:45:39,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:39,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-04 00:45:39,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:39,642 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-04 00:45:39,692 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:39,705 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-04 00:45:39,705 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-04 00:45:40,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:40,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-04 00:45:40,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:40,055 [ 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-04 00:45:40,107 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-04 00:45:40,108 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:40,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:40,444 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:40,489 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:40,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:40,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:40,541 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:40,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd41bb340> has no local changes
2024-07-04 00:45:40,551 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:40,563 [ scc.git] DEBUG [detached HEAD ea33ce9] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:40,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:40,564 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:40,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-04 00:45:41,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-04 00:45:41,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-04 00:45:42,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-04 00:45:43,009 [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-04 00:45:43,468 [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-04 00:45:43,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-04 00:45:44,384 [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-04 00:45:44,385 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-04 00:45:44,386 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:44,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-04 00:45:44,386 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:44,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:44,394 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:44,399 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:44,400 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:44,406 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:44,413 [ scc.git] DEBUG Already up to date.
2024-07-04 00:45:44,414 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-04 00:45:44,828 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-04 00:45:44,828 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-04 00:45:44,832 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:44,833 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:44,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:44,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-04 00:45:44,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:44,852 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-04 00:45:44,862 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:45:44,865 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-04 00:45:44,865 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-04 00:45:44,865 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-04 00:45:44,865 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-04 00:45:44,865 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-04 00:45:44,865 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-04 00:45:45,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:45,031 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:45,074 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:45,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:45,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:45,124 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:45,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd41cdb80> has no local changes
2024-07-04 00:45:45,132 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:45,142 [ scc.git] DEBUG [detached HEAD 3c4d822] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:45,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:45,143 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:45,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-04 00:45:46,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-04 00:45:46,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-04 00:45:47,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-04 00:45:47,528 [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-04 00:45:48,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-04 00:45:48,442 [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-04 00:45:48,443 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-04 00:45:48,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-04 00:45:49,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-04 00:45:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-04 00:45:50,360 [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-04 00:45:50,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-04 00:45:51,223 [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-04 00:45:51,224 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-04 00:45:51,224 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:45:51,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-04 00:45:51,224 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:51,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:51,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:45:51,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:45:51,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:45:51,245 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:45:51,252 [ scc.git] DEBUG Already up to date.
2024-07-04 00:45:51,252 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-04 00:45:51,986 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-04 00:45:51,986 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-04 00:45:51,994 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-04 00:45:52,595 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-04 00:45:52,596 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-04 00:45:52,602 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:45:52,602 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:52,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:52,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-04 00:45:52,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:52,628 [ 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-04 00:45:52,715 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-04 00:45:52,716 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-04 00:45:52,716 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-04 00:45:52,716 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-04 00:45:52,716 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:45:52,717 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:45:52,725 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-04 00:45:52,734 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-04 00:45:52,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:52,904 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-04 00:45:52,913 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-04 00:45:52,920 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-07-04 00:45:52,926 [ scc.config] DEBUG Found github.token
2024-07-04 00:45:52,927 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-04 00:45:52,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-04 00:45:52,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:52,942 [ 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-04 00:45:52,976 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-04 00:45:52,976 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-04 00:45:52,976 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-04 00:45:52,976 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:45:52,977 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:45:52,985 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-04 00:45:52,993 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-04 00:45:53,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:45:53,313 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-04 00:45:53,322 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-04 00:45:53,328 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/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-04 00:45:53,335 [ scc.config] DEBUG Found github.token
2024-07-04 00:45:53,335 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-04 00:45:53,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:45:53,376 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:45:53,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:45:53,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:45:53,426 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:45:53,435 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4228f70> has no local changes
2024-07-04 00:45:53,436 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:45:53,446 [ scc.git] DEBUG [detached HEAD eb7ba61] merge master -Dorg -Ssuccess-only
2024-07-04 00:45:53,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:45:53,447 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:45:53,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-04 00:45:54,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-04 00:45:54,362 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:45:54,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-04 00:45:55,402 [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-04 00:45:55,871 [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-04 00:45:56,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-04 00:45:56,812 [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-04 00:45:56,813 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-04 00:45:57,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-04 00:45:57,276 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:45:57,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-04 00:45:58,369 [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-04 00:45:58,838 [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-04 00:45:59,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-04 00:45:59,686 [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-04 00:45:59,687 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-04 00:46:00,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-04 00:46:00,145 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-04 00:46:00,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-04 00:46:01,150 [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-04 00:46:01,648 [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-04 00:46:02,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-04 00:46:02,526 [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-04 00:46:02,527 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-04 00:46:03,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-04 00:46:03,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-04 00:46:03,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-04 00:46:04,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-04 00:46:04,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-04 00:46:05,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-04 00:46:05,429 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:05,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-04 00:46:05,429 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:05,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:05,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:05,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:05,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:05,448 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:05,454 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:05,455 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-04 00:46:05,989 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-04 00:46:05,989 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-04 00:46:05,996 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-04 00:46:06,420 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-04 00:46:06,420 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-04 00:46:06,425 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-04 00:46:06,865 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-04 00:46:06,865 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-04 00:46:06,871 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:06,871 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:06,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:06,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-04 00:46:06,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:06,890 [ 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-04 00:46:06,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:06,904 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-04 00:46:06,904 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-04 00:46:07,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:07,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-04 00:46:07,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:07,080 [ 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-04 00:46:07,138 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-04 00:46:07,139 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:07,142 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-04 00:46:07,142 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-04 00:46:07,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:07,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-04 00:46:07,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:07,498 [ 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-04 00:46:07,518 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-04 00:46:07,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:07,522 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-04 00:46:07,523 [ scc.git] DEBUG package.json | 2 +-
2024-07-04 00:46:07,523 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-04 00:46:07,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:07,885 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:07,930 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:07,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:07,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:07,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:07,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd422de50> has no local changes
2024-07-04 00:46:07,985 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:07,994 [ scc.git] DEBUG [detached HEAD 73af3b8] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:07,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:07,995 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:08,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-04 00:46:08,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-04 00:46:09,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-04 00:46:09,882 [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-04 00:46:10,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-04 00:46:10,845 [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-04 00:46:10,845 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-04 00:46:10,846 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:10,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-04 00:46:10,846 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:10,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:10,852 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:10,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:10,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:10,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:10,872 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:10,872 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-04 00:46:11,289 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-04 00:46:11,289 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-04 00:46:11,295 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:11,296 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:11,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:11,303 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-04 00:46:11,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:11,317 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-04 00:46:11,328 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:11,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:11,503 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:11,547 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:11,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:11,555 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:11,599 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:11,606 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4185fd0> has no local changes
2024-07-04 00:46:11,607 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:11,617 [ scc.git] DEBUG [detached HEAD a1feb7d] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:11,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:11,618 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:12,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-04 00:46:12,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-04 00:46:12,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-04 00:46:13,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-04 00:46:14,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-04 00:46:14,457 [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-04 00:46:15,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-04 00:46:15,548 [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-04 00:46:15,550 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-04 00:46:15,550 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:15,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-04 00:46:15,550 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:15,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:15,559 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:15,564 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:15,565 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:15,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:15,576 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:15,576 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-04 00:46:16,133 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-04 00:46:16,133 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-04 00:46:16,138 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:16,139 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:16,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:16,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-04 00:46:16,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:16,161 [ 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-04 00:46:16,174 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-04 00:46:16,175 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:16,177 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-04 00:46:16,177 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-04 00:46:16,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:16,341 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:16,382 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:16,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:16,389 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:16,429 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:16,435 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd413d580> has no local changes
2024-07-04 00:46:16,435 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:16,444 [ scc.git] DEBUG [detached HEAD 5239982] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:16,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:16,444 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:16,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-04 00:46:17,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-04 00:46:17,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-04 00:46:18,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-04 00:46:18,864 [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-04 00:46:19,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-04 00:46:19,745 [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-04 00:46:19,745 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-04 00:46:19,745 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:19,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-04 00:46:19,746 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:19,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:19,751 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:19,756 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:19,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:19,762 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:19,768 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:19,768 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-04 00:46:20,232 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-04 00:46:20,232 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-04 00:46:20,238 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:20,239 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:20,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:20,246 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-04 00:46:20,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:20,262 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-04 00:46:20,325 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG Auto-merging setup.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-04 00:46:20,325 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:46:20,326 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:46:20,333 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-04 00:46:20,343 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-04 00:46:20,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:20,505 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-04 00:46:20,514 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-04 00:46:20,525 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-07-04 00:46:20,537 [ scc.config] DEBUG Found github.token
2024-07-04 00:46:20,538 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-04 00:46:20,538 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:20,589 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:20,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:20,597 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:20,646 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:20,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd41b4e80> has no local changes
2024-07-04 00:46:20,654 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:20,664 [ scc.git] DEBUG [detached HEAD 55a598c] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:20,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:20,664 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:20,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-04 00:46:21,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-04 00:46:21,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-04 00:46:22,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-04 00:46:22,919 [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-04 00:46:23,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-04 00:46:23,778 [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-04 00:46:23,779 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-04 00:46:23,779 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:23,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-04 00:46:23,779 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:23,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:23,787 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:23,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:23,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:23,801 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:23,807 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:23,808 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-04 00:46:24,344 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-04 00:46:24,344 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-04 00:46:24,350 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:24,350 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:24,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:24,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-04 00:46:24,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:24,375 [ 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-04 00:46:24,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-04 00:46:24,446 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-04 00:46:24,448 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-04 00:46:24,448 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-04 00:46:24,448 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-04 00:46:24,449 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-04 00:46:24,449 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-04 00:46:24,449 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-04 00:46:24,450 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-04 00:46:24,451 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-04 00:46:24,451 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-04 00:46:24,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:24,616 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:24,655 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:24,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:24,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:24,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:24,704 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd413d730> has no local changes
2024-07-04 00:46:24,704 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:24,713 [ scc.git] DEBUG [detached HEAD 3ce920a] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:24,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:24,714 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:25,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-04 00:46:25,059 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:25,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-04 00:46:25,059 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:25,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:25,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:25,075 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:25,083 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:25,083 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:25,083 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,090 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:25,129 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,135 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:25,172 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:25,178 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd414dbe0> has no local changes
2024-07-04 00:46:25,179 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:25,186 [ scc.git] DEBUG [detached HEAD f93f0a6] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:25,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:25,187 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:25,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-04 00:46:25,494 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:25,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-04 00:46:25,494 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:25,508 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:25,508 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:25,514 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:25,521 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:25,521 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:25,521 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,526 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:25,564 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:25,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:25,572 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:25,610 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:25,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd418f250> has no local changes
2024-07-04 00:46:25,619 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:25,628 [ scc.git] DEBUG [detached HEAD 785cbb1] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:25,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:25,629 [ scc.git] INFO Overriding base-branch from master to main
2024-07-04 00:46:25,629 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:26,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-04 00:46:26,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-04 00:46:26,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-04 00:46:27,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-04 00:46:28,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-04 00:46:28,515 [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-04 00:46:29,036 [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-04 00:46:29,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-04 00:46:29,968 [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-04 00:46:29,969 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-04 00:46:29,969 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:29,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-04 00:46:29,969 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:29,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:29,976 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-04 00:46:29,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:29,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-04 00:46:29,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-04 00:46:29,995 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:29,996 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-04 00:46:30,449 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-04 00:46:30,449 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-04 00:46:30,454 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:30,455 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:30,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:30,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-04 00:46:30,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:30,474 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-04 00:46:30,487 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-04 00:46:30,488 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-04 00:46:30,488 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:46:30,488 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:46:30,494 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-04 00:46:30,500 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-04 00:46:30,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:30,676 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-04 00:46:30,682 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-04 00:46:30,687 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-04 00:46:30,692 [ scc.config] DEBUG Found github.token
2024-07-04 00:46:30,692 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-04 00:46:30,692 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:30,730 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:30,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:30,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:30,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:30,778 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4194f10> has no local changes
2024-07-04 00:46:30,778 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:30,786 [ scc.git] DEBUG [detached HEAD 2bf9cb5] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:30,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:30,787 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:31,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-04 00:46:31,120 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:31,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-04 00:46:31,120 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:31,132 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:31,132 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:31,139 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:31,146 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:31,146 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:31,146 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,152 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:31,194 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,201 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:31,241 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:31,249 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd4149eb0> has no local changes
2024-07-04 00:46:31,249 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:31,259 [ scc.git] DEBUG [detached HEAD 81603fd] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:31,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:31,260 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:31,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-04 00:46:31,556 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:31,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-04 00:46:31,556 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,562 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:31,568 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:31,569 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:31,575 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:31,582 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:31,582 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:31,583 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:31,632 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:31,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:31,638 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:31,681 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:31,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd40b9520> has no local changes
2024-07-04 00:46:31,688 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:31,698 [ scc.git] DEBUG [detached HEAD 6156d66] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:31,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:31,699 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:32,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-04 00:46:32,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-04 00:46:32,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-04 00:46:33,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-04 00:46:34,002 [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-04 00:46:34,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-04 00:46:34,897 [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-04 00:46:34,898 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-04 00:46:34,898 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:34,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-04 00:46:34,898 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:34,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:34,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 00:46:34,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:34,910 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 00:46:34,916 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 00:46:34,922 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:34,922 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-04 00:46:35,344 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-04 00:46:35,344 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-04 00:46:35,349 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:35,349 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:35,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:35,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-04 00:46:35,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:35,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-04 00:46:35,412 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-04 00:46:35,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-04 00:46:35,413 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:46:35,413 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:46:35,420 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-04 00:46:35,428 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-04 00:46:35,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:35,599 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-04 00:46:35,605 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-04 00:46:35,612 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-04 00:46:35,617 [ scc.config] DEBUG Found github.token
2024-07-04 00:46:35,618 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-04 00:46:35,618 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:35,662 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:35,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:35,668 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:35,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:35,716 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd40febe0> has no local changes
2024-07-04 00:46:35,716 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:35,726 [ scc.git] DEBUG [detached HEAD d4f062f] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:35,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:35,727 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-04 00:46:35,727 [ scc.repo] DEBUG ## PRs found:
2024-07-04 00:46:36,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-04 00:46:36,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-04 00:46:37,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-04 00:46:37,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-04 00:46:38,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-04 00:46:38,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-04 00:46:38,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-04 00:46:39,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-04 00:46:39,896 [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-04 00:46:40,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-04 00:46:40,760 [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-04 00:46:40,761 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-04 00:46:41,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-04 00:46:41,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-04 00:46:42,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-04 00:46:42,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-04 00:46:42,718 [ scc.repo] DEBUG ## Branches found:
2024-07-04 00:46:42,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-04 00:46:42,718 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:42,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:42,726 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-04 00:46:42,732 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 00:46:42,732 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-04 00:46:42,738 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-04 00:46:42,744 [ scc.git] DEBUG Already up to date.
2024-07-04 00:46:42,745 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-04 00:46:43,257 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-04 00:46:43,257 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-04 00:46:43,264 [ scc.git] DEBUG ## Unique users: []
2024-07-04 00:46:43,264 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:43,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:43,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-04 00:46:43,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:43,283 [ 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-04 00:46:43,343 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-04 00:46:43,343 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-04 00:46:43,343 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-04 00:46:43,343 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-04 00:46:43,350 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-04 00:46:43,358 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-04 00:46:43,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:43,524 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-04 00:46:43,534 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-04 00:46:43,543 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#115](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-04 00:46:43,550 [ scc.config] DEBUG Found github.token
2024-07-04 00:46:43,551 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-04 00:46:43,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 00:46:43,595 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 00:46:43,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 00:46:43,608 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:43,653 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:43,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd40b93d0> has no local changes
2024-07-04 00:46:43,661 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:43,672 [ scc.git] DEBUG [detached HEAD 812757b] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:43,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:43,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 00:46:43,759 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-04 00:46:43,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:43,947 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-04 00:46:43,954 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-04 00:46:44,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:44,359 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-04 00:46:44,366 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-04 00:46:44,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:44,772 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-04 00:46:44,779 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-04 00:46:45,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:45,187 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-04 00:46:45,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:45,579 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-04 00:46:45,585 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-04 00:46:45,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:45,992 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-04 00:46:45,997 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-04 00:46:46,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:46,402 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-04 00:46:46,407 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-04 00:46:46,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:46,810 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-04 00:46:46,816 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-04 00:46:47,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:47,227 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-04 00:46:47,232 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-04 00:46:47,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:47,631 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-04 00:46:47,636 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-04 00:46:48,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:48,041 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-04 00:46:48,047 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-04 00:46:48,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:48,449 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-04 00:46:48,455 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-04 00:46:48,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:48,866 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-04 00:46:49,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:49,273 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-04 00:46:49,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:49,677 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-04 00:46:49,682 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-04 00:46:50,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:50,095 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-04 00:46:50,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:50,502 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-04 00:46:50,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:50,912 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-04 00:46:50,919 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-04 00:46:51,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:51,310 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-04 00:46:51,316 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-04 00:46:51,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:51,721 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-04 00:46:51,726 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-04 00:46:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:52,142 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-04 00:46:52,149 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-04 00:46:52,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 00:46:52,558 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-04 00:46:52,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 00:46:52,646 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fd555a160> has local changes
2024-07-04 00:46:52,647 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- 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 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Updating 2ca566b..9b73dd9
Previously merged:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 86981348..64566080
Previously merged:
- PR 574 Tom-TBT 'usePolling config for Vite auto refresh'
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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/115/)'
2024-07-04 00:46:52,662 [ scc.git] DEBUG [detached HEAD a2940b0] merge master -Dorg -Ssuccess-only
2024-07-04 00:46:52,662 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-04 00:46:52,662 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-04 00:46:52,662 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,662 [ scc.merge] INFO
2024-07-04 00:46:52,662 [ scc.merge] INFO
2024-07-04 00:46:52,662 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-04 00:46:52,662 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,662 [ scc.merge] INFO
2024-07-04 00:46:52,662 [ scc.merge] INFO
2024-07-04 00:46:52,662 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-04 00:46:52,662 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,662 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-04 00:46:52,662 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-04 00:46:52,663 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-04 00:46:52,663 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-04 00:46:52,663 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-04 00:46:52,663 [ scc.merge] INFO Updating 2ca566b..9b73dd9
2024-07-04 00:46:52,663 [ scc.merge] INFO Previously merged:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-04 00:46:52,663 [ scc.merge] INFO
2024-07-04 00:46:52,663 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-04 00:46:52,663 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
2024-07-04 00:46:52,663 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-04 00:46:52,664 [ scc.merge] INFO Updating 86981348..64566080
2024-07-04 00:46:52,664 [ scc.merge] INFO Previously merged:
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 574 Tom-TBT 'usePolling config for Vite auto refresh'
2024-07-04 00:46:52,664 [ scc.merge] INFO
2024-07-04 00:46:52,664 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-04 00:46:52,664 [ scc.merge] INFO
2024-07-04 00:46:52,664 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-04 00:46:52,664 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,664 [ scc.merge] INFO
2024-07-04 00:46:52,664 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,664 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-04 00:46:52,664 [ scc.merge] INFO
2024-07-04 00:46:52,665 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-04 00:46:52,665 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,665 [ scc.merge] INFO
2024-07-04 00:46:52,665 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,665 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-04 00:46:52,665 [ scc.merge] INFO
2024-07-04 00:46:52,665 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-04 00:46:52,665 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,665 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-04 00:46:52,665 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-04 00:46:52,665 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,666 [ scc.merge] INFO
2024-07-04 00:46:52,666 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-04 00:46:52,666 [ scc.merge] INFO
2024-07-04 00:46:52,666 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-04 00:46:52,666 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,666 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-04 00:46:52,666 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-04 00:46:52,667 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-04 00:46:52,667 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-04 00:46:52,667 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-04 00:46:52,667 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-04 00:46:52,667 [ scc.merge] INFO
2024-07-04 00:46:52,667 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-04 00:46:52,668 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Merged PRs:
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO
2024-07-04 00:46:52,668 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-04 00:46:52,668 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,668 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-04 00:46:52,668 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-04 00:46:52,669 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-04 00:46:52,669 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-04 00:46:52,669 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Repository: ome/scripts
2024-07-04 00:46:52,669 [ scc.merge] INFO Excluded PRs:
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-04 00:46:52,669 [ scc.merge] INFO Already up to date.
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-04 00:46:52,669 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-04 00:46:52,669 [ scc.merge] INFO
2024-07-04 00:46:52,669 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-04 00:46:52,669 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-04 00:46:52,676 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-04 00:46:52,684 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-04 00:46:52,693 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-04 00:46:52,702 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-04 00:46:52,711 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-04 00:46:52,718 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-04 00:46:52,725 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-04 00:46:52,731 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-04 00:46:52,740 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-04 00:46:52,748 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-04 00:46:52,756 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-04 00:46:52,765 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-04 00:46:52,772 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-04 00:46:52,777 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-04 00:46:52,783 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-04 00:46:52,788 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-04 00:46:52,794 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-04 00:46:52,800 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-04 00:46:52,806 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-04 00:46:52,811 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-04 00:46:52,816 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-04 00:46:52,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-04 00:46:52,822 [ scc.git] DEBUG Calling 'git remote'
2024-07-04 00:46:52,827 [ 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 c757deb] 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 86981348
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 2dfa6c4] 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-04 00:47:40,874 [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-04 00:47:50,690 [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-04 00:47:53,388 [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-04 00:47:58,443 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-04 00:48:50,841 [ 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/0ce0ee70/images/svgs/logo.svg){kind=logo}
