Console Output
Skipping 90 KB..
Full Log.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-20 00:44:19,219 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-20 00:44:19,219 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-20 00:44:19,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:19,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:44:19,598 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:19,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:19,605 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:44:19,647 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:44:19,655 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638225970> has no local changes
2024-06-20 00:44:19,655 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Generated by OMERO-plugins-push#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:44:19,665 [ scc.git] DEBUG [detached HEAD 4652705] merge master -Dorg -Ssuccess-only
2024-06-20 00:44:19,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:44:19,666 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:44:20,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-20 00:44:20,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-20 00:44:20,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-06-20 00:44:21,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-20 00:44:21,951 [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-06-20 00:44:22,432 [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-06-20 00:44:22,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-20 00:44:23,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:23,324 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-20 00:44:23,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-20 00:44:24,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-20 00:44:24,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-20 00:44:25,174 [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-06-20 00:44:25,667 [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-06-20 00:44:26,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-20 00:44:26,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:26,594 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-20 00:44:27,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-20 00:44:27,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-20 00:44:28,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-20 00:44:28,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-20 00:44:29,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-20 00:44:29,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:29,497 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-20 00:44:29,497 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:44:29,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-20 00:44:29,498 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:29,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:29,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:44:29,510 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:44:29,510 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:44:29,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:44:29,533 [ scc.git] DEBUG Updating ffc7e075..9ffbc8b7
2024-06-20 00:44:30,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/570 HTTP/1.1" 200 None
2024-06-20 00:44:30,170 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-20 00:44:30,605 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-20 00:44:30,606 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-20 00:44:30,612 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-20 00:44:31,030 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-20 00:44:31,031 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-20 00:44:31,037 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-20 00:44:31,429 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-20 00:44:31,430 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-20 00:44:31,436 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:44:31,436 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:31,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:31,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-20 00:44:31,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:31,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-20 00:44:31,606 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-20 00:44:31,615 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-20 00:44:31,615 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-20 00:44:31,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:31,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-20 00:44:31,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:31,784 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-20 00:44:31,937 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-20 00:44:31,938 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-20 00:44:31,938 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-20 00:44:31,939 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:31,948 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-20 00:44:31,948 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-20 00:44:31,948 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-20 00:44:31,948 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-20 00:44:32,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:32,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-20 00:44:32,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:32,180 [ 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-06-20 00:44:32,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:32,233 [ scc.git] DEBUG setup.py | 2 +-
2024-06-20 00:44:32,233 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-20 00:44:32,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:32,579 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:44:32,623 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:32,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:32,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:44:32,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:44:32,682 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56381e0bb0> has no local changes
2024-06-20 00:44:32,683 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating ffc7e075..9ffbc8b7
Previously merged:
- PR 570 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:44:32,698 [ scc.git] DEBUG [detached HEAD 9cd07eb2] merge master -Dorg -Ssuccess-only
2024-06-20 00:44:32,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:44:32,699 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:44:33,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-20 00:44:33,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-20 00:44:34,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-20 00:44:34,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-20 00:44:34,942 [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-06-20 00:44:35,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-20 00:44:35,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:35,874 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-20 00:44:35,874 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:44:35,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-20 00:44:35,874 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:35,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:35,882 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:44:35,888 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:44:35,889 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:44:35,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:44:35,904 [ scc.git] DEBUG Already up to date.
2024-06-20 00:44:35,904 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-20 00:44:36,282 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-20 00:44:36,282 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-20 00:44:36,287 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:44:36,287 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:36,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:36,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-20 00:44:36,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:36,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-20 00:44:36,315 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-20 00:44:36,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:36,318 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-20 00:44:36,318 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-20 00:44:36,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:36,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:44:36,507 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:36,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:36,513 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:44:36,555 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:44:36,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563821cdf0> has no local changes
2024-06-20 00:44:36,563 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:44:36,573 [ scc.git] DEBUG [detached HEAD 9d4e32b] merge master -Dorg -Ssuccess-only
2024-06-20 00:44:36,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:44:36,574 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:44:36,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-20 00:44:37,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-20 00:44:37,430 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:44:37,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-20 00:44:38,517 [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-06-20 00:44:38,989 [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-06-20 00:44:39,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-20 00:44:39,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:39,927 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-20 00:44:39,927 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:44:39,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-20 00:44:39,927 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:39,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:39,935 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:44:39,942 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:44:39,942 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:44:39,951 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:44:39,958 [ scc.git] DEBUG Already up to date.
2024-06-20 00:44:39,959 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-20 00:44:40,399 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-20 00:44:40,400 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-20 00:44:40,405 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:44:40,405 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:40,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:40,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-20 00:44:40,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:40,428 [ 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-06-20 00:44:40,449 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:40,454 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-20 00:44:40,458 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-20 00:44:40,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:40,624 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:44:40,673 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:40,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:40,681 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:44:40,730 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:44:40,738 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563821c340> has no local changes
2024-06-20 00:44:40,739 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:44:40,751 [ scc.git] DEBUG [detached HEAD 10c4b30] merge master -Dorg -Ssuccess-only
2024-06-20 00:44:40,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:44:40,751 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:44:41,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-20 00:44:41,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-06-20 00:44:41,628 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:44:42,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-20 00:44:42,675 [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-06-20 00:44:43,159 [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-06-20 00:44:43,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-20 00:44:44,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:44,018 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-20 00:44:44,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-06-20 00:44:44,468 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:44:45,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-20 00:44:45,513 [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-06-20 00:44:46,040 [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-06-20 00:44:46,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-20 00:44:46,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:46,927 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-20 00:44:47,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-20 00:44:47,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-20 00:44:48,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-20 00:44:48,869 [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-06-20 00:44:49,354 [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-06-20 00:44:49,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-20 00:44:50,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:50,256 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-20 00:44:50,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-20 00:44:51,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-20 00:44:51,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-20 00:44:52,208 [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-06-20 00:44:52,706 [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-06-20 00:44:53,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-20 00:44:53,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:53,646 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-20 00:44:54,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-20 00:44:54,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-20 00:44:55,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-20 00:44:55,561 [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-06-20 00:44:56,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-20 00:44:56,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:44:56,463 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-20 00:44:56,464 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:44:56,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-20 00:44:56,464 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:56,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:56,473 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:44:56,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:44:56,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:44:56,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:44:56,526 [ scc.git] DEBUG Updating 7b7a637..a8f380f
2024-06-20 00:44:57,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/476 HTTP/1.1" 200 None
2024-06-20 00:44:57,153 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-20 00:44:57,591 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-20 00:44:57,591 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-20 00:44:57,598 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-20 00:44:58,401 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-20 00:44:58,401 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-20 00:44:58,408 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-20 00:44:58,774 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-20 00:44:58,774 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-20 00:44:58,781 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-06-20 00:44:59,204 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-20 00:44:59,204 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-06-20 00:44:59,211 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-06-20 00:44:59,581 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-20 00:44:59,581 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-06-20 00:44:59,588 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:44:59,588 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:44:59,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:59,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-20 00:44:59,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:59,612 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-20 00:44:59,629 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-20 00:44:59,630 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:59,633 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-20 00:44:59,633 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-20 00:44:59,633 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-20 00:44:59,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:44:59,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-20 00:44:59,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:44:59,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-20 00:44:59,843 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-20 00:44:59,843 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-20 00:44:59,843 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-20 00:44:59,843 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-20 00:44:59,844 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:44:59,848 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-20 00:44:59,848 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-20 00:44:59,848 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-20 00:44:59,848 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-20 00:44:59,848 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-20 00:44:59,848 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-20 00:44:59,848 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-20 00:44:59,848 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-20 00:45:00,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:00,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-20 00:45:00,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:00,229 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-20 00:45:00,243 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-20 00:45:00,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:00,247 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-20 00:45:00,247 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-20 00:45:00,247 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-20 00:45:00,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:00,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-20 00:45:00,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:00,635 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-20 00:45:00,652 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:00,662 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-06-20 00:45:00,662 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-06-20 00:45:01,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:01,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-06-20 00:45:01,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:01,056 [ 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-06-20 00:45:01,090 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-20 00:45:01,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:01,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:01,452 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:01,499 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:01,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:01,509 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:01,552 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:01,560 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638201df0> has no local changes
2024-06-20 00:45:01,560 [ 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)
Updating 7b7a637..a8f380f
Previously merged:
- PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:01,571 [ scc.git] DEBUG [detached HEAD a219adb] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:01,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:01,572 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:01,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-20 00:45:02,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-20 00:45:02,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-20 00:45:03,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-20 00:45:04,066 [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-06-20 00:45:04,543 [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-06-20 00:45:04,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-20 00:45:05,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:05,408 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-20 00:45:05,408 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:05,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-20 00:45:05,409 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:05,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:05,416 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:05,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:05,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:05,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:05,440 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:05,441 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-20 00:45:05,814 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-20 00:45:05,814 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-20 00:45:05,819 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:05,819 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:05,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:05,827 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-20 00:45:05,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:05,842 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-20 00:45:05,856 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:05,859 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-20 00:45:05,859 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-20 00:45:05,859 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-20 00:45:05,859 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-20 00:45:05,862 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-20 00:45:05,863 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-20 00:45:06,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:06,017 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:06,067 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:06,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:06,075 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:06,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:06,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56381adbb0> has no local changes
2024-06-20 00:45:06,141 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:06,152 [ scc.git] DEBUG [detached HEAD a6026e6] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:06,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:06,153 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:06,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-20 00:45:07,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-20 00:45:07,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-20 00:45:08,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-20 00:45:08,548 [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-06-20 00:45:08,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-20 00:45:09,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:09,404 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-20 00:45:09,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-20 00:45:10,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-20 00:45:10,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-20 00:45:11,293 [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-06-20 00:45:11,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-20 00:45:12,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:12,157 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-20 00:45:12,157 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:12,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-20 00:45:12,157 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:12,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:12,164 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:12,169 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:12,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:12,176 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:12,182 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:12,182 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-20 00:45:12,734 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-20 00:45:12,734 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-20 00:45:12,739 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-20 00:45:13,129 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-20 00:45:13,129 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-20 00:45:13,134 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:13,134 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:13,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:13,141 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-20 00:45:13,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:13,154 [ 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-06-20 00:45:13,207 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-20 00:45:13,208 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-20 00:45:13,208 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-20 00:45:13,208 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-20 00:45:13,208 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:45:13,208 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:45:13,214 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-20 00:45:13,221 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-20 00:45:13,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:13,392 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-20 00:45:13,399 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-20 00:45:13,405 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-20 00:45:13,410 [ scc.config] DEBUG Found github.token
2024-06-20 00:45:13,411 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-20 00:45:13,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-20 00:45:13,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:13,423 [ 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-06-20 00:45:13,440 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-20 00:45:13,440 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-20 00:45:13,440 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-20 00:45:13,441 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:45:13,441 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:45:13,447 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-20 00:45:13,456 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-20 00:45:13,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:13,794 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-20 00:45:13,802 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-20 00:45:13,810 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/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-06-20 00:45:13,817 [ scc.config] DEBUG Found github.token
2024-06-20 00:45:13,817 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-20 00:45:13,818 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:13,859 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:13,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:13,866 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:13,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:13,921 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56381f7f40> has no local changes
2024-06-20 00:45:13,921 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:13,943 [ scc.git] DEBUG [detached HEAD a9d9cda] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:13,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:13,944 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:14,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-20 00:45:14,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-20 00:45:14,946 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:45:15,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-20 00:45:16,002 [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-06-20 00:45:16,503 [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-06-20 00:45:17,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-20 00:45:17,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:17,471 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-20 00:45:17,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-20 00:45:17,931 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:45:18,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-20 00:45:19,036 [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-06-20 00:45:19,556 [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-06-20 00:45:20,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-20 00:45:20,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:20,553 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-20 00:45:21,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-20 00:45:21,016 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-20 00:45:21,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-20 00:45:22,084 [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-06-20 00:45:22,577 [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-06-20 00:45:23,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-20 00:45:23,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:23,525 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-20 00:45:23,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-20 00:45:24,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-20 00:45:24,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-20 00:45:25,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-20 00:45:25,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-20 00:45:26,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-20 00:45:26,391 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:26,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-20 00:45:26,391 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:26,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:26,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:26,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:26,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:26,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:26,417 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:26,418 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-20 00:45:26,824 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-20 00:45:26,824 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-20 00:45:26,829 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-20 00:45:27,210 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-20 00:45:27,210 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-20 00:45:27,215 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-20 00:45:27,587 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-20 00:45:27,587 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-20 00:45:27,593 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:27,593 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:27,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:27,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-20 00:45:27,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:27,612 [ 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-06-20 00:45:27,623 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:27,626 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-20 00:45:27,626 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-20 00:45:27,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:27,767 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-20 00:45:27,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:27,781 [ 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-06-20 00:45:27,793 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-20 00:45:27,794 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:27,797 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-20 00:45:27,797 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-20 00:45:28,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:28,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-20 00:45:28,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:28,196 [ 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-06-20 00:45:28,208 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-20 00:45:28,209 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:28,212 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-20 00:45:28,212 [ scc.git] DEBUG package.json | 2 +-
2024-06-20 00:45:28,212 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-20 00:45:28,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:28,598 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:28,642 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:28,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:28,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:28,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:28,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638165640> has no local changes
2024-06-20 00:45:28,708 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:28,720 [ scc.git] DEBUG [detached HEAD d539b99] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:28,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:28,721 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:29,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-20 00:45:29,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-20 00:45:30,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-20 00:45:30,506 [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-06-20 00:45:30,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-20 00:45:31,371 [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-06-20 00:45:31,373 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-20 00:45:31,373 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:31,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-20 00:45:31,373 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:31,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:31,384 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:31,395 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:31,395 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:31,405 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:31,417 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:31,418 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-20 00:45:31,800 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-20 00:45:31,800 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-20 00:45:31,807 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:31,807 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:31,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:31,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-20 00:45:31,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:31,834 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-20 00:45:31,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:32,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:32,023 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:32,066 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:32,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:32,074 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:32,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:32,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563820abe0> has no local changes
2024-06-20 00:45:32,122 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:32,132 [ scc.git] DEBUG [detached HEAD 2f3897f] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:32,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:32,132 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:32,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-20 00:45:32,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-20 00:45:33,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-20 00:45:33,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-20 00:45:34,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-20 00:45:34,886 [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-06-20 00:45:35,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-20 00:45:35,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:35,803 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-20 00:45:35,803 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:35,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-20 00:45:35,803 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:35,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:35,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:35,825 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:35,825 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:35,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:35,848 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:35,849 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-20 00:45:36,236 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-20 00:45:36,236 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-20 00:45:36,243 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:36,244 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:36,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:36,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-20 00:45:36,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:36,271 [ 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-06-20 00:45:36,285 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-20 00:45:36,286 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:36,288 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-20 00:45:36,288 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-20 00:45:36,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:36,457 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:36,503 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:36,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:36,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:36,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:36,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563811c550> has no local changes
2024-06-20 00:45:36,563 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:36,573 [ scc.git] DEBUG [detached HEAD d910665] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:36,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:36,574 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:37,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-20 00:45:37,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-20 00:45:37,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-20 00:45:38,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-20 00:45:38,879 [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-06-20 00:45:39,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-20 00:45:39,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:39,747 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-20 00:45:39,747 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:39,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-20 00:45:39,748 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:39,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:39,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:39,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:39,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:39,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:39,778 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:39,778 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-20 00:45:40,184 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-20 00:45:40,184 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-20 00:45:40,190 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:40,190 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:40,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:40,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-20 00:45:40,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:40,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-20 00:45:40,348 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG Auto-merging setup.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-20 00:45:40,348 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:45:40,349 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:45:40,356 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-20 00:45:40,364 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-20 00:45:40,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:40,519 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-20 00:45:40,527 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-20 00:45:40,535 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-06-20 00:45:40,542 [ scc.config] DEBUG Found github.token
2024-06-20 00:45:40,542 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-20 00:45:40,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:40,590 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:40,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:40,598 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:40,649 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:40,658 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56381a8f40> has no local changes
2024-06-20 00:45:40,659 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:40,670 [ scc.git] DEBUG [detached HEAD 8317abd] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:40,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:40,671 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:41,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-20 00:45:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-20 00:45:41,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-20 00:45:42,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-20 00:45:42,932 [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-06-20 00:45:43,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-20 00:45:43,787 [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-06-20 00:45:43,788 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-20 00:45:43,788 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:43,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-20 00:45:43,788 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:43,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:43,795 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:43,804 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:43,804 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:43,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:43,825 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:43,825 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-20 00:45:44,250 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-20 00:45:44,250 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-20 00:45:44,256 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:44,257 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:44,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:44,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-20 00:45:44,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:44,282 [ 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-06-20 00:45:44,301 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-20 00:45:44,305 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-20 00:45:44,307 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-20 00:45:44,308 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-20 00:45:44,308 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-20 00:45:44,308 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-20 00:45:44,309 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-20 00:45:44,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:44,458 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:44,513 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:44,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:44,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:44,568 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:44,577 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563811c730> has no local changes
2024-06-20 00:45:44,577 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:44,589 [ scc.git] DEBUG [detached HEAD 60f970e] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:44,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:44,590 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:44,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-20 00:45:44,901 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:44,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-20 00:45:44,901 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:44,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:44,910 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:44,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:44,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:44,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:44,937 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:44,938 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:44,938 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:44,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:44,945 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:44,996 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:44,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:45,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:45,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:45,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563812db80> has no local changes
2024-06-20 00:45:45,062 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:45,073 [ scc.git] DEBUG [detached HEAD 882d23a] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:45,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:45,074 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:45,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-20 00:45:45,339 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:45,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-20 00:45:45,339 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:45,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:45,347 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:45,353 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:45,353 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:45,358 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:45,364 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:45,364 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:45,364 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:45,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:45,370 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:45,418 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:45,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:45,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:45,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:45,480 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638181d90> has no local changes
2024-06-20 00:45:45,481 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:45,493 [ scc.git] DEBUG [detached HEAD ae8ba4c] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:45,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:45,494 [ scc.git] INFO Overriding base-branch from master to main
2024-06-20 00:45:45,494 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:45,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-20 00:45:46,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-20 00:45:46,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-20 00:45:47,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-20 00:45:47,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-20 00:45:48,292 [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-06-20 00:45:48,748 [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-06-20 00:45:49,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-20 00:45:49,624 [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-06-20 00:45:49,626 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-20 00:45:49,626 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:49,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-20 00:45:49,626 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:49,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:49,634 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-20 00:45:49,640 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:49,641 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-20 00:45:49,647 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-20 00:45:49,653 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:49,654 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-20 00:45:50,006 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-20 00:45:50,006 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-20 00:45:50,012 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:50,012 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:50,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-20 00:45:50,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-20 00:45:50,041 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-20 00:45:50,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-20 00:45:50,042 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:45:50,042 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:45:50,048 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-20 00:45:50,055 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-20 00:45:50,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:50,218 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-20 00:45:50,227 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-20 00:45:50,238 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-20 00:45:50,246 [ scc.config] DEBUG Found github.token
2024-06-20 00:45:50,246 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-20 00:45:50,246 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:50,295 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:50,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,304 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:50,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:50,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563817fdf0> has no local changes
2024-06-20 00:45:50,358 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:50,369 [ scc.git] DEBUG [detached HEAD 0aa505d] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:50,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:50,370 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:50,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-20 00:45:50,649 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:50,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-20 00:45:50,649 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:50,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,656 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:50,662 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:50,662 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:50,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:50,675 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:50,675 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:50,675 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:50,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,681 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:50,723 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:50,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:50,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:50,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:50,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f563814ae80> has no local changes
2024-06-20 00:45:50,780 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:50,789 [ scc.git] DEBUG [detached HEAD 109496c] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:50,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:50,790 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:51,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-20 00:45:51,083 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:51,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-20 00:45:51,083 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:51,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:51,090 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:51,096 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:51,096 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:51,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:51,109 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:51,110 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:51,110 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:51,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:51,116 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:51,161 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:51,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:51,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:51,209 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:51,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638099400> has no local changes
2024-06-20 00:45:51,233 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:51,244 [ scc.git] DEBUG [detached HEAD f30aecd] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:51,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:51,245 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:51,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-20 00:45:52,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-20 00:45:52,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-20 00:45:52,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-20 00:45:53,428 [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-06-20 00:45:53,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-20 00:45:54,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:45:54,300 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-20 00:45:54,300 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:45:54,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-20 00:45:54,300 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:54,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:54,312 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-20 00:45:54,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:45:54,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-20 00:45:54,329 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-20 00:45:54,338 [ scc.git] DEBUG Already up to date.
2024-06-20 00:45:54,339 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-20 00:45:54,726 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-20 00:45:54,726 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-20 00:45:54,732 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:45:54,732 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:54,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:54,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-20 00:45:54,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:54,752 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-20 00:45:54,763 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-20 00:45:54,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-20 00:45:54,763 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:45:54,764 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:45:54,770 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-20 00:45:54,779 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-20 00:45:54,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:45:54,940 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-20 00:45:54,948 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-20 00:45:54,956 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-20 00:45:54,962 [ scc.config] DEBUG Found github.token
2024-06-20 00:45:54,962 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-20 00:45:54,962 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:45:55,008 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:45:55,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:45:55,015 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:45:55,063 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:45:55,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56380deb80> has no local changes
2024-06-20 00:45:55,073 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:45:55,084 [ scc.git] DEBUG [detached HEAD a2c2c4c] merge master -Dorg -Ssuccess-only
2024-06-20 00:45:55,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:45:55,085 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-20 00:45:55,085 [ scc.repo] DEBUG ## PRs found:
2024-06-20 00:45:55,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-20 00:45:56,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-20 00:45:56,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-20 00:45:57,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-20 00:45:57,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-20 00:45:57,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-20 00:45:58,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-20 00:45:58,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-20 00:45:59,378 [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-06-20 00:45:59,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-20 00:46:00,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-20 00:46:00,249 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-20 00:46:00,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-20 00:46:01,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-20 00:46:01,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-20 00:46:02,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-20 00:46:02,208 [ scc.repo] DEBUG ## Branches found:
2024-06-20 00:46:02,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-20 00:46:02,209 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:46:02,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:46:02,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-20 00:46:02,226 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-20 00:46:02,227 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-20 00:46:02,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-20 00:46:02,247 [ scc.git] DEBUG Already up to date.
2024-06-20 00:46:02,248 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-20 00:46:02,658 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-20 00:46:02,658 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-20 00:46:02,663 [ scc.git] DEBUG ## Unique users: []
2024-06-20 00:46:02,663 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:46:02,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:46:02,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-20 00:46:02,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:46:02,686 [ 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-06-20 00:46:02,699 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-20 00:46:02,699 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-20 00:46:02,699 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-20 00:46:02,699 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-20 00:46:02,706 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-20 00:46:02,714 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-20 00:46:02,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:02,876 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-20 00:46:02,885 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-20 00:46:02,892 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#102](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-20 00:46:02,898 [ scc.config] DEBUG Found github.token
2024-06-20 00:46:02,898 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-20 00:46:02,899 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-20 00:46:02,943 [ scc.git] DEBUG Get sha1 of %s
2024-06-20 00:46:02,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-20 00:46:02,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:46:02,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:46:03,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638109d00> has no local changes
2024-06-20 00:46:03,004 [ 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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:46:03,016 [ scc.git] DEBUG [detached HEAD 8de90ee] merge master -Dorg -Ssuccess-only
2024-06-20 00:46:03,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:03,017 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-20 00:46:03,110 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-20 00:46:03,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:03,304 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-20 00:46:03,311 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-20 00:46:03,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:03,712 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-20 00:46:03,721 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-20 00:46:04,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:04,123 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-20 00:46:04,130 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-20 00:46:04,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:04,532 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-20 00:46:04,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:04,941 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-20 00:46:04,948 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-20 00:46:05,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:05,348 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-20 00:46:05,357 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-20 00:46:05,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:05,757 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-20 00:46:05,767 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-20 00:46:06,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:06,164 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-20 00:46:06,170 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-20 00:46:06,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:06,586 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-20 00:46:06,592 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-20 00:46:06,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:07,008 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-20 00:46:07,015 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-20 00:46:07,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:07,428 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-20 00:46:07,437 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-20 00:46:07,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:07,835 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-20 00:46:07,841 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-20 00:46:08,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:08,254 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-20 00:46:08,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:08,699 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-20 00:46:09,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:09,112 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-20 00:46:09,121 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-20 00:46:09,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:09,546 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-20 00:46:09,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:09,955 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-20 00:46:10,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:10,360 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-20 00:46:10,370 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-20 00:46:10,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:10,757 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-20 00:46:10,764 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-20 00:46:11,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:11,167 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-20 00:46:11,175 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-20 00:46:11,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:11,586 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-20 00:46:11,593 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-20 00:46:11,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-20 00:46:11,993 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-20 00:46:11,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-20 00:46:12,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5638afbc40> has local changes
2024-06-20 00:46:12,096 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating ffc7e075..9ffbc8b7
Previously merged:
- PR 570 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
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)
Updating 7b7a637..a8f380f
Previously merged:
- PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
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#102 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/102/)'
2024-06-20 00:46:12,111 [ scc.git] DEBUG [detached HEAD 23f1fc5] merge master -Dorg -Ssuccess-only
2024-06-20 00:46:12,111 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-20 00:46:12,112 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-20 00:46:12,112 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-20 00:46:12,112 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-20 00:46:12,112 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-20 00:46:12,112 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-20 00:46:12,112 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-20 00:46:12,112 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,112 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-20 00:46:12,112 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-20 00:46:12,112 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-20 00:46:12,113 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-20 00:46:12,113 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-20 00:46:12,113 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-20 00:46:12,113 [ scc.merge] INFO Updating ffc7e075..9ffbc8b7
2024-06-20 00:46:12,113 [ scc.merge] INFO Previously merged:
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 570 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-20 00:46:12,113 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-20 00:46:12,113 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,113 [ scc.merge] INFO
2024-06-20 00:46:12,113 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-20 00:46:12,114 [ scc.merge] INFO
2024-06-20 00:46:12,114 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-20 00:46:12,114 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,114 [ scc.merge] INFO
2024-06-20 00:46:12,114 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-20 00:46:12,114 [ scc.merge] INFO
2024-06-20 00:46:12,114 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-20 00:46:12,114 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-20 00:46:12,114 [ scc.merge] INFO Updating 7b7a637..a8f380f
2024-06-20 00:46:12,114 [ scc.merge] INFO Previously merged:
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
2024-06-20 00:46:12,114 [ scc.merge] INFO
2024-06-20 00:46:12,114 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-20 00:46:12,114 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-20 00:46:12,115 [ scc.merge] INFO
2024-06-20 00:46:12,115 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-20 00:46:12,115 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-20 00:46:12,115 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,115 [ scc.merge] INFO
2024-06-20 00:46:12,115 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-20 00:46:12,115 [ scc.merge] INFO
2024-06-20 00:46:12,115 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-20 00:46:12,115 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,115 [ scc.merge] INFO
2024-06-20 00:46:12,115 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-20 00:46:12,115 [ scc.merge] INFO
2024-06-20 00:46:12,115 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-20 00:46:12,115 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-20 00:46:12,115 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-20 00:46:12,116 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-20 00:46:12,116 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-20 00:46:12,116 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-20 00:46:12,116 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,116 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-20 00:46:12,116 [ scc.merge] INFO
2024-06-20 00:46:12,116 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-20 00:46:12,117 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,117 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-20 00:46:12,117 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Merged PRs:
2024-06-20 00:46:12,117 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-20 00:46:12,117 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-20 00:46:12,117 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO
2024-06-20 00:46:12,117 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-20 00:46:12,117 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,118 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-20 00:46:12,118 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,118 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-20 00:46:12,118 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-20 00:46:12,118 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-20 00:46:12,118 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,118 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-20 00:46:12,118 [ scc.merge] INFO
2024-06-20 00:46:12,118 [ scc.merge] INFO Repository: ome/scripts
2024-06-20 00:46:12,118 [ scc.merge] INFO Excluded PRs:
2024-06-20 00:46:12,119 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-20 00:46:12,119 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-20 00:46:12,119 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-20 00:46:12,119 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-20 00:46:12,119 [ scc.merge] INFO Already up to date.
2024-06-20 00:46:12,119 [ scc.merge] INFO
2024-06-20 00:46:12,119 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-20 00:46:12,119 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-20 00:46:12,119 [ scc.merge] INFO
2024-06-20 00:46:12,119 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-20 00:46:12,119 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-20 00:46:12,128 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-20 00:46:12,136 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-20 00:46:12,145 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-20 00:46:12,154 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-20 00:46:12,162 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-20 00:46:12,170 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-20 00:46:12,179 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-20 00:46:12,188 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-20 00:46:12,196 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-20 00:46:12,205 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-20 00:46:12,213 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-20 00:46:12,220 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-20 00:46:12,230 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-20 00:46:12,238 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-20 00:46:12,248 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-20 00:46:12,256 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-20 00:46:12,266 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-20 00:46:12,272 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-20 00:46:12,278 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-20 00:46:12,285 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-20 00:46:12,292 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-20 00:46:12,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-20 00:46:12,298 [ scc.git] DEBUG Calling 'git remote'
2024-06-20 00:46:12,304 [ 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 2e03a6a] 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 ffc7e075
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from 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 5a90893
nothing to commit, working tree clean
[detached HEAD 06fb5dd] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-20 00:47:00,148 [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-06-20 00:47:09,105 [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-06-20 00:47:11,485 [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-06-20 00:47:16,101 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-20 00:48:03,846 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
