Console Output
Skipping 97 KB..
Full Log13cf92e086da24ab'
2024-08-29 14:38:46,497 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-29 14:38:46,497 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-29 14:38:46,497 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-29 14:38:46,497 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-29 14:38:46,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:38:46,503 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-29 14:38:46,503 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-29 14:38:46,503 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-29 14:38:46,505 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-29 14:38:46,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:46,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-29 14:38:46,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:46,658 [ 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-08-29 14:38:46,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:38:46,733 [ scc.git] DEBUG setup.py | 2 +-
2024-08-29 14:38:46,733 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-29 14:38:47,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:47,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0a7113351ae2f245c40f9ee39f4bc1ccadef1521'
2024-08-29 14:38:47,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:47,046 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 578 (Image outline) 0a7113351ae2f245c40f9ee39f4bc1ccadef1521'
2024-08-29 14:38:47,069 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-29 14:38:47,069 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-29 14:38:47,069 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-29 14:38:47,069 [ scc.git] DEBUG Auto-merging src/templates/rois_form.template.html
2024-08-29 14:38:47,069 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/templates/rois_form.template.html
2024-08-29 14:38:47,069 [ scc.git] DEBUG Auto-merging src/templates/shapes/shape_toolbar.template.html
2024-08-29 14:38:47,069 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:38:47,069 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:38:47,075 [ scc.git] DEBUG Calling 'git reset --hard 6c4e793a7729c9e3e8dbf0b3d6948abce6cdedfd'
2024-08-29 14:38:47,084 [ scc.git] DEBUG HEAD is now at 6c4e793a merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-08-29 14:38:47,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:47,425 [ scc.git] DEBUG Calling 'git merge-base cbdd365756caa80353d6b3ffd66259efbda098ee 0a7113351ae2f245c40f9ee39f4bc1ccadef1521'
2024-08-29 14:38:47,431 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..cbdd365756caa80353d6b3ffd66259efbda098ee'
2024-08-29 14:38:47,436 [ scc.git] INFO - PR 578 Rdornier 'Image outline'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/templates/rois_form.template.html
--conflicts
2024-08-29 14:38:47,440 [ scc.config] DEBUG Found github.token
2024-08-29 14:38:47,441 [ scc.git] DEBUG Adding comment to issue #578.
2024-08-29 14:38:48,236 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/578/comments HTTP/1.1" 201 1994
2024-08-29 14:38:48,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-29 14:38:48,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:48,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-29 14:38:48,402 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-29 14:38:48,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:38:48,406 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-08-29 14:38:48,406 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-08-29 14:38:48,406 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-08-29 14:38:48,406 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-08-29 14:38:48,406 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-08-29 14:38:48,406 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-08-29 14:38:48,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:48,627 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:38:48,664 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:48,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:48,668 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:38:48,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:38:48,709 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4505c70> has no local changes
2024-08-29 14:38:48,710 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 577 Rdornier 'Fill rois' (status: failure)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
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'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 578 Rdornier 'Image outline'
Generated by OMERO-plugins-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:38:48,719 [ scc.git] DEBUG [detached HEAD cc89bef3] merge master -Dorg -Ssuccess-only
2024-08-29 14:38:48,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:38:48,719 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:38:49,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-29 14:38:49,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-29 14:38:49,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-29 14:38:50,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-29 14:38:50,952 [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-08-29 14:38:51,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-29 14:38:51,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:38:51,928 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-29 14:38:51,928 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:38:51,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-29 14:38:51,929 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:51,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:51,934 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:38:51,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:38:51,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:38:51,944 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:38:51,949 [ scc.git] DEBUG Already up to date.
2024-08-29 14:38:51,949 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-29 14:38:52,271 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-29 14:38:52,271 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-29 14:38:52,275 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:38:52,275 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:52,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:52,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-29 14:38:52,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:52,290 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-29 14:38:52,307 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-29 14:38:52,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:38:52,310 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-29 14:38:52,310 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-29 14:38:52,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:52,463 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:38:52,499 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:52,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:52,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:38:52,538 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:38:52,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded5552eb0> has no local changes
2024-08-29 14:38:52,544 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:38:52,552 [ scc.git] DEBUG [detached HEAD fadd9bb] merge master -Dorg -Ssuccess-only
2024-08-29 14:38:52,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:38:52,552 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:38:52,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-29 14:38:53,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-29 14:38:53,434 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:38:54,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-29 14:38:54,519 [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-08-29 14:38:55,155 [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-08-29 14:38:55,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-29 14:38:56,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:38:56,081 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-29 14:38:56,081 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:38:56,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-29 14:38:56,081 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:56,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:56,087 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:38:56,091 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:38:56,091 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:38:56,096 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:38:56,101 [ scc.git] DEBUG Already up to date.
2024-08-29 14:38:56,101 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-29 14:38:56,399 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-29 14:38:56,400 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-29 14:38:56,403 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:38:56,404 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:56,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:56,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-29 14:38:56,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:56,418 [ 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-08-29 14:38:56,428 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:38:56,431 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-29 14:38:56,431 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-29 14:38:56,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:38:56,571 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:38:56,608 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:38:56,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:38:56,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:38:56,648 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:38:56,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4505a30> has no local changes
2024-08-29 14:38:56,654 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:38:56,663 [ scc.git] DEBUG [detached HEAD d4779c5] merge master -Dorg -Ssuccess-only
2024-08-29 14:38:56,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:38:56,663 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:38:57,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-29 14:38:57,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-29 14:38:58,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-08-29 14:38:58,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-29 14:38:59,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 14:38:59,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 14:39:00,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-29 14:39:00,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:00,517 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-29 14:39:00,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-29 14:39:01,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-29 14:39:01,473 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:39:02,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-29 14:39:02,731 [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-08-29 14:39:03,233 [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-08-29 14:39:03,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-29 14:39:04,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:04,063 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-29 14:39:04,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-29 14:39:04,521 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:39:05,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-29 14:39:05,630 [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-08-29 14:39:06,111 [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-08-29 14:39:06,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-29 14:39:06,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:06,950 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-29 14:39:07,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-29 14:39:07,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-29 14:39:08,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-29 14:39:08,848 [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-08-29 14:39:09,313 [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-08-29 14:39:09,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-29 14:39:10,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:10,163 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-29 14:39:10,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-29 14:39:11,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-29 14:39:11,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-29 14:39:12,091 [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-08-29 14:39:12,579 [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-08-29 14:39:13,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-29 14:39:13,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:13,441 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-29 14:39:13,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-29 14:39:14,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-29 14:39:14,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-29 14:39:15,321 [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-08-29 14:39:15,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-29 14:39:16,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:16,220 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-29 14:39:16,220 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:16,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-29 14:39:16,220 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:16,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:16,226 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:16,230 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:16,230 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:16,236 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:16,241 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:16,241 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-29 14:39:17,160 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:17,160 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-29 14:39:17,165 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-29 14:39:18,169 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:18,170 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-29 14:39:18,174 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-29 14:39:18,526 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:18,527 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-29 14:39:18,531 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-29 14:39:18,807 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:18,807 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-29 14:39:18,811 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-29 14:39:19,092 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:19,093 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-29 14:39:19,097 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-29 14:39:19,372 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 14:39:19,372 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-29 14:39:19,376 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:19,376 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:19,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:19,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-29 14:39:19,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:19,391 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-29 14:39:19,482 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-29 14:39:19,483 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:19,485 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-29 14:39:19,485 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-29 14:39:19,485 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-29 14:39:19,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:19,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-29 14:39:19,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:19,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-29 14:39:19,719 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-29 14:39:19,719 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-29 14:39:19,719 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-29 14:39:19,719 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-29 14:39:19,719 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:19,723 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-29 14:39:19,723 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-29 14:39:19,723 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-29 14:39:19,723 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-29 14:39:19,723 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-29 14:39:19,723 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-29 14:39:19,723 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-29 14:39:19,723 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-29 14:39:20,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:20,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-29 14:39:20,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:20,055 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-29 14:39:20,219 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-29 14:39:20,219 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:20,222 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-29 14:39:20,222 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-29 14:39:20,222 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-29 14:39:20,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:20,425 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-29 14:39:20,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:20,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-29 14:39:20,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:20,500 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-29 14:39:20,500 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-29 14:39:20,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:20,810 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-29 14:39:20,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:20,822 [ 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-08-29 14:39:20,952 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 14:39:20,953 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:21,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:21,201 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-29 14:39:21,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:21,212 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-29 14:39:21,516 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-29 14:39:21,516 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-29 14:39:21,516 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-29 14:39:21,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-29 14:39:21,521 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-29 14:39:21,521 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-29 14:39:21,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:21,661 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:21,698 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:21,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:21,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:21,738 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:21,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4526b80> has no local changes
2024-08-29 14:39:21,746 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
Generated by OMERO-plugins-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:21,755 [ scc.git] DEBUG [detached HEAD 2466f5b] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:21,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:21,755 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:22,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-29 14:39:22,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-29 14:39:23,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-29 14:39:23,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-29 14:39:24,213 [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-08-29 14:39:24,696 [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-08-29 14:39:25,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-29 14:39:25,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:25,593 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-29 14:39:25,594 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:25,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-29 14:39:25,594 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:25,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:25,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:25,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:25,604 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:25,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:25,614 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:25,614 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-29 14:39:25,965 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-29 14:39:25,966 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-29 14:39:25,969 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:25,969 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:25,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:25,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-29 14:39:25,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:25,984 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-29 14:39:25,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:25,996 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-29 14:39:25,996 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-29 14:39:25,996 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-29 14:39:25,996 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-29 14:39:25,996 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-29 14:39:25,996 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-29 14:39:26,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:26,147 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:26,182 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:26,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:26,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:26,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:26,228 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded44cd730> has no local changes
2024-08-29 14:39:26,228 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:26,254 [ scc.git] DEBUG [detached HEAD 5a2c98a] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:26,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:26,255 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:26,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-29 14:39:27,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-08-29 14:39:27,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-29 14:39:28,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 14:39:28,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-29 14:39:29,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:29,051 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-08-29 14:39:29,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-29 14:39:30,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-29 14:39:30,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-29 14:39:31,051 [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-08-29 14:39:31,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-29 14:39:31,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:31,953 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-29 14:39:32,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-29 14:39:32,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-29 14:39:33,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-29 14:39:33,814 [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-08-29 14:39:34,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-29 14:39:34,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:34,740 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-29 14:39:34,741 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:34,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-29 14:39:34,741 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:34,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:34,746 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:34,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:34,751 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:34,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:34,761 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:34,761 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-29 14:39:35,178 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 14:39:35,178 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-29 14:39:35,182 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-29 14:39:35,677 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 14:39:35,677 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-29 14:39:35,681 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-08-29 14:39:36,092 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 14:39:36,092 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-08-29 14:39:36,094 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:36,094 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:36,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:36,100 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-29 14:39:36,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:36,110 [ 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-08-29 14:39:36,208 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-29 14:39:36,208 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-29 14:39:36,208 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-29 14:39:36,208 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-29 14:39:36,208 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:39:36,209 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:39:36,214 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 14:39:36,219 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-29 14:39:36,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:36,361 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-29 14:39:36,367 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 14:39:36,372 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-29 14:39:36,377 [ scc.config] DEBUG Found github.token
2024-08-29 14:39:36,377 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-29 14:39:36,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-29 14:39:36,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:36,387 [ 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-08-29 14:39:36,456 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-29 14:39:36,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-29 14:39:36,456 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-29 14:39:36,456 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:39:36,457 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:39:36,462 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 14:39:36,468 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-29 14:39:36,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:36,753 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-29 14:39:36,759 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 14:39:36,764 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/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-08-29 14:39:36,768 [ scc.config] DEBUG Found github.token
2024-08-29 14:39:36,768 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-29 14:39:36,768 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-29 14:39:36,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:36,777 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-29 14:39:36,788 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:36,790 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-08-29 14:39:36,790 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-08-29 14:39:37,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:37,136 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:37,172 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:37,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:37,177 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:37,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:37,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded44cd550> has no local changes
2024-08-29 14:39:37,218 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:37,225 [ scc.git] DEBUG [detached HEAD 25afdc6] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:37,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:37,226 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:37,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-29 14:39:38,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-29 14:39:38,144 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:39:38,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-29 14:39:39,216 [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-08-29 14:39:39,690 [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-08-29 14:39:40,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-29 14:39:40,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:40,547 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-29 14:39:40,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-29 14:39:40,989 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:39:41,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-29 14:39:42,096 [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-08-29 14:39:42,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-08-29 14:39:43,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-29 14:39:43,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:43,567 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-29 14:39:44,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-29 14:39:44,044 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 14:39:44,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-29 14:39:45,083 [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-08-29 14:39:45,528 [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-08-29 14:39:45,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-29 14:39:46,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:46,423 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-29 14:39:46,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-29 14:39:47,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-29 14:39:47,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-29 14:39:48,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-29 14:39:48,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-29 14:39:49,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-29 14:39:49,267 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:49,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-29 14:39:49,267 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:49,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:49,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:49,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:49,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:49,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:49,287 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:49,287 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-29 14:39:49,587 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 14:39:49,587 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-29 14:39:49,591 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-29 14:39:49,886 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 14:39:49,887 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-29 14:39:49,891 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-29 14:39:50,172 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 14:39:50,172 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-29 14:39:50,176 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:50,176 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:50,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:50,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-29 14:39:50,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:50,190 [ 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-08-29 14:39:50,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:50,202 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-29 14:39:50,202 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-29 14:39:50,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:50,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-29 14:39:50,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:50,367 [ 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-08-29 14:39:50,441 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 14:39:50,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:50,444 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-29 14:39:50,444 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-29 14:39:50,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:50,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-29 14:39:50,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:50,760 [ 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-08-29 14:39:50,770 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 14:39:50,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:50,773 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-29 14:39:50,773 [ scc.git] DEBUG package.json | 2 +-
2024-08-29 14:39:50,773 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-29 14:39:51,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:51,248 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:51,285 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:51,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:51,290 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:51,326 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:51,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4518c40> has no local changes
2024-08-29 14:39:51,332 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:51,339 [ scc.git] DEBUG [detached HEAD c36aec3] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:51,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:51,340 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:51,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-29 14:39:52,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-29 14:39:52,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-29 14:39:53,144 [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-08-29 14:39:53,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-29 14:39:54,091 [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-08-29 14:39:54,092 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-29 14:39:54,092 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:54,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-29 14:39:54,092 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:54,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:54,098 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:54,102 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:54,102 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:54,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:54,112 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:54,112 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-29 14:39:54,430 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-29 14:39:54,430 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-29 14:39:54,433 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:54,434 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:54,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:54,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-29 14:39:54,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:54,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-29 14:39:54,456 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:54,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:54,619 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:54,654 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:54,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:54,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:54,693 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:54,698 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded44869d0> has no local changes
2024-08-29 14:39:54,698 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:54,705 [ scc.git] DEBUG [detached HEAD d3b0294] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:54,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:54,706 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:55,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-29 14:39:55,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-29 14:39:56,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-29 14:39:56,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-29 14:39:57,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-29 14:39:57,532 [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-08-29 14:39:57,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-29 14:39:58,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:39:58,348 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-29 14:39:58,348 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:39:58,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-29 14:39:58,349 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:58,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:58,354 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:39:58,359 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:39:58,359 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:39:58,364 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:39:58,369 [ scc.git] DEBUG Already up to date.
2024-08-29 14:39:58,369 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-29 14:39:58,888 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-29 14:39:58,889 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-29 14:39:58,893 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:39:58,893 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:58,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:58,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-29 14:39:58,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:58,908 [ 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-08-29 14:39:58,918 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-29 14:39:58,918 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:39:58,920 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-29 14:39:58,920 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-29 14:39:59,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:39:59,075 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:39:59,110 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:39:59,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:39:59,115 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:39:59,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:39:59,156 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded44dfbb0> has no local changes
2024-08-29 14:39:59,156 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:39:59,164 [ scc.git] DEBUG [detached HEAD 3325c05] merge master -Dorg -Ssuccess-only
2024-08-29 14:39:59,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:39:59,165 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:39:59,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-29 14:40:00,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-29 14:40:00,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-29 14:40:01,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-29 14:40:01,506 [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-08-29 14:40:02,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-29 14:40:02,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:40:02,512 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-29 14:40:02,512 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:02,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-29 14:40:02,512 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:02,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:02,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:02,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:02,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:02,528 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:02,533 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:02,533 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-29 14:40:02,846 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-29 14:40:02,846 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-29 14:40:02,850 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:02,850 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:02,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:02,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 14:40:02,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:02,865 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 14:40:02,915 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG Auto-merging setup.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-29 14:40:02,916 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:40:02,916 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:40:02,921 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-29 14:40:02,926 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-29 14:40:03,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:03,080 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 14:40:03,085 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-29 14:40:03,091 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-08-29 14:40:03,095 [ scc.config] DEBUG Found github.token
2024-08-29 14:40:03,095 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-29 14:40:03,095 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:03,131 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:03,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:03,136 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:03,170 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:03,176 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4496460> has no local changes
2024-08-29 14:40:03,176 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:03,184 [ scc.git] DEBUG [detached HEAD b680301] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:03,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:03,184 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:03,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-29 14:40:04,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-29 14:40:04,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-29 14:40:05,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-29 14:40:05,531 [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-08-29 14:40:06,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-29 14:40:06,471 [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-08-29 14:40:06,471 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-29 14:40:06,471 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:06,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-29 14:40:06,472 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:06,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:06,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:06,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:06,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:06,487 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:06,492 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:06,492 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-29 14:40:06,904 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-29 14:40:06,905 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-29 14:40:06,908 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:06,909 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:06,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:06,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-29 14:40:06,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:06,924 [ 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-08-29 14:40:06,940 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-29 14:40:06,943 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-29 14:40:06,945 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-29 14:40:06,946 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-29 14:40:06,946 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-29 14:40:06,946 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-29 14:40:06,947 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-29 14:40:06,947 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-29 14:40:06,947 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-29 14:40:07,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:07,093 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:07,129 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,133 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:07,168 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:07,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded443d880> has no local changes
2024-08-29 14:40:07,174 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:07,182 [ scc.git] DEBUG [detached HEAD e0a9396] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:07,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:07,182 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:07,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-29 14:40:07,517 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:07,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-29 14:40:07,517 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:07,527 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:07,527 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:07,532 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:07,537 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:07,537 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:07,537 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:07,577 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:07,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:07,622 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded448bee0> has no local changes
2024-08-29 14:40:07,623 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:07,630 [ scc.git] DEBUG [detached HEAD bfa7a2d] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:07,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:07,630 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:07,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-29 14:40:07,950 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:07,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-29 14:40:07,951 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:07,960 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:07,960 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:07,965 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:07,969 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:07,970 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:07,970 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:07,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:07,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:08,010 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:08,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:08,014 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:08,051 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:08,056 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded443d6a0> has no local changes
2024-08-29 14:40:08,056 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:08,063 [ scc.git] DEBUG [detached HEAD 3b1d382] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:08,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:08,064 [ scc.git] INFO Overriding base-branch from master to main
2024-08-29 14:40:08,064 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:08,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-29 14:40:08,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-29 14:40:09,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-29 14:40:09,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-29 14:40:10,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-29 14:40:10,825 [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-08-29 14:40:11,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-29 14:40:11,886 [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-08-29 14:40:11,886 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-29 14:40:11,886 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:11,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-29 14:40:11,887 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:11,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:11,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-29 14:40:11,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:11,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-29 14:40:11,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-29 14:40:11,907 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:11,907 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-29 14:40:12,285 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-29 14:40:12,285 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-29 14:40:12,289 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:12,289 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:12,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:12,294 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 14:40:12,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:12,304 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 14:40:12,413 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-29 14:40:12,414 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-29 14:40:12,414 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:40:12,414 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:40:12,419 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-29 14:40:12,425 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-29 14:40:12,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:12,570 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 14:40:12,575 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-29 14:40:12,580 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-29 14:40:12,584 [ scc.config] DEBUG Found github.token
2024-08-29 14:40:12,584 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-29 14:40:12,585 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:12,621 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:12,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:12,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:12,663 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:12,668 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded446f670> has no local changes
2024-08-29 14:40:12,668 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:12,675 [ scc.git] DEBUG [detached HEAD 38429de] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:12,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:12,676 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:12,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-29 14:40:12,988 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:12,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-29 14:40:12,988 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:12,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:12,993 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:12,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:12,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:13,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:13,007 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:13,007 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:13,007 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:13,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:13,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:13,048 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:13,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:13,052 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:13,087 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:13,092 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded449ee80> has no local changes
2024-08-29 14:40:13,092 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:13,100 [ scc.git] DEBUG [detached HEAD 8671536] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:13,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:13,100 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:13,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-29 14:40:13,424 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:13,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-29 14:40:13,424 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:13,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:13,428 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:13,433 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:13,433 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:13,438 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:13,442 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:13,442 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:13,442 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:13,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:13,447 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:13,482 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:13,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:13,486 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:13,520 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:13,526 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4414640> has no local changes
2024-08-29 14:40:13,526 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:13,533 [ scc.git] DEBUG [detached HEAD 5533a47] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:13,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:13,533 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:13,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-29 14:40:14,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-29 14:40:14,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-29 14:40:15,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-29 14:40:15,798 [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-08-29 14:40:16,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-29 14:40:16,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:40:16,796 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-29 14:40:16,796 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:16,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-29 14:40:16,797 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:16,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:16,802 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 14:40:16,806 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:16,806 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 14:40:16,811 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 14:40:16,816 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:16,816 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-29 14:40:17,118 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-29 14:40:17,118 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-29 14:40:17,121 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:17,121 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:17,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:17,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 14:40:17,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:17,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 14:40:17,160 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-29 14:40:17,161 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-29 14:40:17,161 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:40:17,161 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:40:17,166 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-29 14:40:17,172 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-29 14:40:17,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:17,316 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 14:40:17,321 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-29 14:40:17,325 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-29 14:40:17,330 [ scc.config] DEBUG Found github.token
2024-08-29 14:40:17,330 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-29 14:40:17,330 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:17,365 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:17,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:17,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:17,404 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:17,409 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded4425d90> has no local changes
2024-08-29 14:40:17,409 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:17,417 [ scc.git] DEBUG [detached HEAD 5dfe47b] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:17,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:17,417 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-29 14:40:17,417 [ scc.repo] DEBUG ## PRs found:
2024-08-29 14:40:17,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-29 14:40:18,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-29 14:40:18,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-29 14:40:19,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-29 14:40:19,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-29 14:40:20,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-29 14:40:20,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-29 14:40:21,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-29 14:40:21,861 [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-08-29 14:40:22,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-29 14:40:22,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-29 14:40:22,761 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-29 14:40:23,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-29 14:40:23,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-29 14:40:24,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-29 14:40:24,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-29 14:40:24,699 [ scc.repo] DEBUG ## Branches found:
2024-08-29 14:40:24,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-29 14:40:24,699 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:24,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:24,704 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-29 14:40:24,708 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 14:40:24,708 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-29 14:40:24,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-29 14:40:24,718 [ scc.git] DEBUG Already up to date.
2024-08-29 14:40:24,719 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-29 14:40:25,323 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-29 14:40:25,323 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-29 14:40:25,326 [ scc.git] DEBUG ## Unique users: []
2024-08-29 14:40:25,326 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:25,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:25,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-29 14:40:25,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:25,342 [ 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-08-29 14:40:25,431 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-29 14:40:25,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-29 14:40:25,431 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 14:40:25,431 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 14:40:25,436 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-29 14:40:25,442 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-29 14:40:25,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:25,593 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-29 14:40:25,599 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-29 14:40:25,604 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-29 14:40:25,608 [ scc.config] DEBUG Found github.token
2024-08-29 14:40:25,608 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-29 14:40:25,609 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 14:40:25,644 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 14:40:25,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 14:40:25,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:25,682 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:25,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded447b190> has no local changes
2024-08-29 14:40:25,688 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:25,695 [ scc.git] DEBUG [detached HEAD 5baf21c] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:25,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:25,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 14:40:25,763 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-29 14:40:25,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:26,006 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-29 14:40:26,010 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-29 14:40:26,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:26,462 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-29 14:40:26,466 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-29 14:40:26,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:26,865 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-29 14:40:26,869 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-29 14:40:27,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:27,273 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-29 14:40:27,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:27,653 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-29 14:40:27,658 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-29 14:40:28,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:28,070 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-29 14:40:28,074 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-29 14:40:28,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:28,460 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-29 14:40:28,464 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-29 14:40:28,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:28,843 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-29 14:40:28,848 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-29 14:40:29,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:29,247 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-29 14:40:29,251 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-29 14:40:29,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:29,678 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-29 14:40:29,682 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-29 14:40:30,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:30,063 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-29 14:40:30,068 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-29 14:40:30,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:30,441 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-29 14:40:30,445 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-29 14:40:30,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:30,854 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-29 14:40:31,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:31,239 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-29 14:40:31,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:31,616 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-29 14:40:31,620 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-29 14:40:31,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:32,007 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-29 14:40:32,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:32,396 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-29 14:40:32,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:32,778 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-29 14:40:32,782 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-29 14:40:33,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:33,163 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-29 14:40:33,167 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-29 14:40:33,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:33,545 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-29 14:40:33,549 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-29 14:40:33,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:33,941 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-29 14:40:33,945 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-29 14:40:34,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 14:40:34,334 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-29 14:40:34,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 14:40:34,407 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fded7353e20> has local changes
2024-08-29 14:40:34,408 [ 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 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 577 Rdornier 'Fill rois' (status: failure)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
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'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 578 Rdornier 'Image outline'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/167/)'
2024-08-29 14:40:34,420 [ scc.git] DEBUG [detached HEAD 771334f] merge master -Dorg -Ssuccess-only
2024-08-29 14:40:34,421 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-29 14:40:34,421 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-29 14:40:34,421 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-29 14:40:34,421 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-29 14:40:34,421 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-29 14:40:34,421 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-29 14:40:34,421 [ scc.merge] INFO
2024-08-29 14:40:34,421 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-29 14:40:34,421 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-29 14:40:34,421 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-29 14:40:34,422 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-29 14:40:34,422 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-29 14:40:34,422 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-29 14:40:34,422 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (status: failure)
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-29 14:40:34,422 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-29 14:40:34,422 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,422 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,422 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-29 14:40:34,422 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-29 14:40:34,423 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-29 14:40:34,423 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-29 14:40:34,423 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-29 14:40:34,423 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-29 14:40:34,423 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-29 14:40:34,423 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-29 14:40:34,423 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-29 14:40:34,423 [ scc.merge] INFO
2024-08-29 14:40:34,423 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-29 14:40:34,424 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-29 14:40:34,424 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Merged PRs:
2024-08-29 14:40:34,424 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,424 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-29 14:40:34,424 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,424 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-29 14:40:34,425 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Repository: ome/scripts
2024-08-29 14:40:34,425 [ scc.merge] INFO Excluded PRs:
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-29 14:40:34,425 [ scc.merge] INFO Already up to date.
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 14:40:34,425 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-29 14:40:34,425 [ scc.merge] INFO
2024-08-29 14:40:34,425 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-29 14:40:34,426 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-29 14:40:34,430 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-29 14:40:34,434 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-29 14:40:34,439 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-29 14:40:34,443 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-29 14:40:34,448 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-29 14:40:34,452 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-29 14:40:34,456 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-29 14:40:34,461 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-29 14:40:34,465 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-29 14:40:34,470 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-29 14:40:34,474 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-29 14:40:34,479 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-29 14:40:34,483 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-29 14:40:34,488 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-29 14:40:34,492 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-29 14:40:34,497 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-29 14:40:34,501 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-29 14:40:34,505 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-29 14:40:34,510 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-29 14:40:34,514 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-29 14:40:34,519 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 14:40:34,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-29 14:40:34,523 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 14:40:34,527 [ 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.2 to 5.9.3-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 205f938] 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 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 cbdd3657
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 5f9fc18] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-29 14:41:21,245 [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-08-29 14:41:30,096 [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-08-29 14:41:32,447 [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-08-29 14:41:36,993 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-29 14:42:18,849 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/58f98332/images/svgs/logo.svg){kind=logo}
