Console Output
Skipping 101 KB..
Full Lognel_model.js
2024-08-30 00:43:43,534 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-30 00:43:43,534 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:43:43,542 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-30 00:43:43,542 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-30 00:43:43,542 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/index.html | 1 +
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-30 00:43:43,542 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-30 00:43:43,543 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-30 00:43:43,543 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-30 00:43:43,543 [ scc.git] DEBUG src/templates/image_display_options.template.html | 6 ++-
2024-08-30 00:43:43,543 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-30 00:43:43,543 [ scc.git] DEBUG 14 files changed, 163 insertions(+), 16 deletions(-)
2024-08-30 00:43:43,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:43,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-30 00:43:43,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:43,891 [ 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-30 00:43:43,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:43:43,915 [ scc.git] DEBUG setup.py | 2 +-
2024-08-30 00:43:43,915 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-30 00:43:44,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:44,309 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-30 00:43:44,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:44,327 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 578 (Image outline) 8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-30 00:43:44,355 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-30 00:43:44,355 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-30 00:43:44,355 [ scc.git] DEBUG Auto-merging src/js/views/panel_view.js
2024-08-30 00:43:44,355 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-30 00:43:44,355 [ scc.git] DEBUG Auto-merging src/templates/rois_form.template.html
2024-08-30 00:43:44,355 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/templates/rois_form.template.html
2024-08-30 00:43:44,355 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:43:44,356 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:43:44,365 [ scc.git] DEBUG Calling 'git reset --hard ce68a460beeb2388bcbe7b741e71991c74b5d621'
2024-08-30 00:43:44,375 [ scc.git] DEBUG HEAD is now at ce68a460 merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-08-30 00:43:44,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:44,692 [ scc.git] DEBUG Calling 'git merge-base cbdd365756caa80353d6b3ffd66259efbda098ee 8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-30 00:43:44,700 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..cbdd365756caa80353d6b3ffd66259efbda098ee'
2024-08-30 00:43:44,706 [ scc.git] INFO - PR 578 Rdornier 'Image outline'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/templates/rois_form.template.html
--conflicts
2024-08-30 00:43:44,710 [ scc.config] DEBUG Found github.token
2024-08-30 00:43:44,711 [ scc.git] DEBUG Adding comment to issue #578.
2024-08-30 00:43:45,393 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/578/comments HTTP/1.1" 201 1994
2024-08-30 00:43:45,395 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-30 00:43:45,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:45,410 [ 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-30 00:43:45,426 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-30 00:43:45,427 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:43:45,431 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-08-30 00:43:45,431 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-08-30 00:43:45,431 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-08-30 00:43:45,431 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-08-30 00:43:45,431 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-08-30 00:43:45,431 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-08-30 00:43:45,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:45,790 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:43:45,831 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:45,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:45,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:43:45,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:43:45,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0f9ab80> has no local changes
2024-08-30 00:43:45,885 [ 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 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 560 will-moore 'Max projection bytes'
- 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:43:45,895 [ scc.git] DEBUG [detached HEAD adb7fc46] merge master -Dorg -Ssuccess-only
2024-08-30 00:43:45,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:43:45,896 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:43:46,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-30 00:43:46,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-30 00:43:47,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-30 00:43:47,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-30 00:43:48,135 [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-30 00:43:48,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-30 00:43:49,052 [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-30 00:43:49,053 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-30 00:43:49,053 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:43:49,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-30 00:43:49,053 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:49,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:49,060 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:43:49,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:43:49,069 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:43:49,078 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:43:49,084 [ scc.git] DEBUG Already up to date.
2024-08-30 00:43:49,084 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-30 00:43:49,397 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-30 00:43:49,398 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-30 00:43:49,403 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:43:49,403 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:49,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:49,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-30 00:43:49,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:49,422 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-30 00:43:49,432 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-30 00:43:49,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:43:49,435 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-30 00:43:49,435 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-30 00:43:49,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:49,569 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:43:49,610 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:49,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:49,616 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:43:49,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:43:49,664 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0f9aac0> has no local changes
2024-08-30 00:43:49,664 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:43:49,674 [ scc.git] DEBUG [detached HEAD 1c5c68c] merge master -Dorg -Ssuccess-only
2024-08-30 00:43:49,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:43:49,674 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:43:50,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-30 00:43:50,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-30 00:43:50,470 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:43:51,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-30 00:43:51,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-30 00:43:52,048 [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-30 00:43:52,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-30 00:43:52,963 [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-30 00:43:52,965 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-30 00:43:52,965 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:43:52,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-30 00:43:52,965 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:52,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:52,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:43:52,978 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:43:52,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:43:52,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:43:52,990 [ scc.git] DEBUG Already up to date.
2024-08-30 00:43:52,990 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-30 00:43:53,300 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-30 00:43:53,301 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-30 00:43:53,305 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:43:53,305 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:53,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:53,311 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-30 00:43:53,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:53,322 [ 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-30 00:43:53,334 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:43:53,338 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-30 00:43:53,338 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-30 00:43:53,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:43:53,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:43:53,515 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:43:53,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:43:53,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:43:53,563 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:43:53,573 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0f9ab20> has no local changes
2024-08-30 00:43:53,573 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:43:53,585 [ scc.git] DEBUG [detached HEAD ca3279f] merge master -Dorg -Ssuccess-only
2024-08-30 00:43:53,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:43:53,586 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:43:54,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-30 00:43:54,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-30 00:43:54,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-08-30 00:43:55,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-30 00:43:55,875 [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-30 00:43:56,347 [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-30 00:43:56,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-30 00:43:57,244 [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-30 00:43:57,245 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-30 00:43:57,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-30 00:43:58,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-30 00:43:58,153 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:43:58,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-30 00:43:59,279 [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-30 00:43:59,761 [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-30 00:44:00,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-30 00:44:00,736 [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-30 00:44:00,737 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-30 00:44:01,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-30 00:44:01,187 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:44:01,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-30 00:44:02,205 [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-30 00:44:02,709 [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-30 00:44:03,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-30 00:44:03,696 [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-30 00:44:03,697 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-30 00:44:04,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-30 00:44:04,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-30 00:44:05,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-30 00:44:05,533 [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-30 00:44:06,007 [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-30 00:44:06,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-30 00:44:06,824 [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-30 00:44:06,824 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-30 00:44:07,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-30 00:44:07,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-30 00:44:08,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-30 00:44:08,690 [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-30 00:44:09,169 [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-30 00:44:09,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-30 00:44:10,072 [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-30 00:44:10,073 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-30 00:44:10,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-30 00:44:10,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-30 00:44:11,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-30 00:44:11,898 [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-30 00:44:12,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-30 00:44:12,837 [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-30 00:44:12,837 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-30 00:44:12,838 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:12,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-30 00:44:12,838 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:12,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:12,844 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:12,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:12,849 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:12,855 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:12,861 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:12,861 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-30 00:44:13,187 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:13,187 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-30 00:44:13,191 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-30 00:44:13,474 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:13,474 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-30 00:44:13,479 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-30 00:44:13,782 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:13,782 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-30 00:44:13,787 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-30 00:44:14,082 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:14,083 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-30 00:44:14,087 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-30 00:44:14,387 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:14,387 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-30 00:44:14,392 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-30 00:44:14,672 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-30 00:44:14,672 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-30 00:44:14,676 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:14,676 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:14,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:14,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-30 00:44:14,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:14,695 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-30 00:44:14,708 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-30 00:44:14,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:14,712 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-30 00:44:14,712 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-30 00:44:14,712 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-30 00:44:14,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:14,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-30 00:44:14,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:14,862 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-30 00:44:14,880 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-30 00:44:14,880 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-30 00:44:14,880 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-30 00:44:14,880 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-30 00:44:14,881 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:14,885 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-30 00:44:14,885 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-30 00:44:14,885 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-30 00:44:14,885 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-30 00:44:14,885 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-30 00:44:14,885 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-30 00:44:14,885 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-30 00:44:14,885 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-30 00:44:15,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:15,244 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-30 00:44:15,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:15,257 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-30 00:44:15,270 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-30 00:44:15,270 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:15,273 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-30 00:44:15,273 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-30 00:44:15,273 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-30 00:44:15,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:15,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-30 00:44:15,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:15,643 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-30 00:44:15,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:15,668 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-30 00:44:15,668 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-30 00:44:16,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:16,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-30 00:44:16,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:16,040 [ 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-30 00:44:16,071 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-30 00:44:16,072 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:16,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:16,421 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-30 00:44:16,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:16,433 [ 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-30 00:44:16,448 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-30 00:44:16,448 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-30 00:44:16,448 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-30 00:44:16,449 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-30 00:44:16,453 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-30 00:44:16,453 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-30 00:44:16,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:16,804 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:16,841 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:16,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:16,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:16,882 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:16,889 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0fbcbb0> has no local changes
2024-08-30 00:44:16,889 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:16,899 [ scc.git] DEBUG [detached HEAD 4a72a07] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:16,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:16,899 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:17,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-30 00:44:17,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-30 00:44:18,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-30 00:44:18,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-30 00:44:19,214 [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-30 00:44:19,651 [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-30 00:44:20,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-30 00:44:20,462 [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-30 00:44:20,463 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-30 00:44:20,463 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:20,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-30 00:44:20,464 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:20,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:20,471 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:20,476 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:20,476 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:20,481 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:20,488 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:20,488 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-30 00:44:20,827 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-30 00:44:20,827 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-30 00:44:20,831 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:20,832 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:20,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:20,837 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-30 00:44:20,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:20,847 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-30 00:44:20,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:20,859 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-30 00:44:20,859 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-30 00:44:20,859 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-30 00:44:20,859 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-30 00:44:20,859 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-30 00:44:20,859 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-30 00:44:20,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:20,992 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:21,034 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:21,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:21,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:21,077 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:21,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c07627f0> has no local changes
2024-08-30 00:44:21,084 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:21,091 [ scc.git] DEBUG [detached HEAD 071af27] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:21,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:21,092 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:21,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-30 00:44:21,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-08-30 00:44:22,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-30 00:44:22,909 [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-30 00:44:23,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-30 00:44:23,719 [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-30 00:44:23,720 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-08-30 00:44:24,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-30 00:44:24,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-30 00:44:25,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-30 00:44:25,569 [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-30 00:44:25,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-30 00:44:26,365 [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-30 00:44:26,366 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-30 00:44:26,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-30 00:44:27,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-30 00:44:27,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-30 00:44:28,247 [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-30 00:44:28,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-30 00:44:29,168 [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-30 00:44:29,169 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-30 00:44:29,169 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:29,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-30 00:44:29,169 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:29,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:29,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:29,181 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:29,181 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:29,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:29,191 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:29,191 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-30 00:44:29,493 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-30 00:44:29,493 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-30 00:44:29,498 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-30 00:44:29,802 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-30 00:44:29,803 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-30 00:44:29,807 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-08-30 00:44:30,086 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-30 00:44:30,086 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-08-30 00:44:30,090 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:30,091 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:30,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:30,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-30 00:44:30,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:30,109 [ 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-30 00:44:30,123 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-30 00:44:30,124 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-30 00:44:30,124 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-30 00:44:30,124 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-30 00:44:30,124 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:44:30,124 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:44:30,130 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-30 00:44:30,138 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-30 00:44:30,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:30,282 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-30 00:44:30,289 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-30 00:44:30,295 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-30 00:44:30,300 [ scc.config] DEBUG Found github.token
2024-08-30 00:44:30,301 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-30 00:44:30,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-30 00:44:30,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:30,316 [ 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-30 00:44:30,338 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-30 00:44:30,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-30 00:44:30,339 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-30 00:44:30,339 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:44:30,339 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:44:30,346 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-30 00:44:30,353 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-30 00:44:30,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:30,672 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-30 00:44:30,680 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-30 00:44:30,685 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/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-30 00:44:30,690 [ scc.config] DEBUG Found github.token
2024-08-30 00:44:30,690 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-30 00:44:30,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-30 00:44:30,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:30,700 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-30 00:44:30,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:30,714 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-08-30 00:44:30,714 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-08-30 00:44:31,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:31,055 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:31,094 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:31,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:31,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:31,137 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:31,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c07625b0> has no local changes
2024-08-30 00:44:31,144 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:31,152 [ scc.git] DEBUG [detached HEAD 9cef85a] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:31,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:31,153 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:31,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-30 00:44:32,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-30 00:44:32,071 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:44:32,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-30 00:44:33,171 [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-30 00:44:33,675 [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-30 00:44:34,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-30 00:44:34,658 [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-30 00:44:34,659 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-30 00:44:35,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-30 00:44:35,109 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:44:35,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-30 00:44:36,152 [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-30 00:44:36,674 [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-30 00:44:37,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-30 00:44:37,579 [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-30 00:44:37,580 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-30 00:44:38,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-30 00:44:38,027 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-30 00:44:38,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-30 00:44:39,102 [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-30 00:44:39,617 [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-30 00:44:40,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-30 00:44:40,584 [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-30 00:44:40,585 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-30 00:44:41,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-30 00:44:41,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-30 00:44:41,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-30 00:44:42,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-30 00:44:42,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-30 00:44:43,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-30 00:44:43,351 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:43,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-30 00:44:43,351 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:43,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:43,357 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:43,362 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:43,362 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:43,367 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:43,372 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:43,373 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-30 00:44:43,680 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-30 00:44:43,680 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-30 00:44:43,685 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-30 00:44:44,009 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-30 00:44:44,009 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-30 00:44:44,014 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-30 00:44:44,287 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-30 00:44:44,287 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-30 00:44:44,291 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:44,292 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:44,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:44,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-30 00:44:44,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:44,307 [ 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-30 00:44:44,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:44,318 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-30 00:44:44,318 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-30 00:44:44,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:44,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-30 00:44:44,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:44,459 [ 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-30 00:44:44,470 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-30 00:44:44,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:44,473 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-30 00:44:44,474 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-30 00:44:44,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:44,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-30 00:44:44,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:44,848 [ 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-30 00:44:44,858 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-30 00:44:44,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:44,861 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-30 00:44:44,861 [ scc.git] DEBUG package.json | 2 +-
2024-08-30 00:44:44,861 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-30 00:44:45,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:45,222 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:45,261 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:45,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:45,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:45,303 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:45,310 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0fafca0> has no local changes
2024-08-30 00:44:45,310 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:45,318 [ scc.git] DEBUG [detached HEAD 3bcc820] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:45,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:45,319 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:45,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-30 00:44:46,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-30 00:44:46,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-30 00:44:47,095 [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-30 00:44:47,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-30 00:44:47,980 [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-30 00:44:47,981 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-30 00:44:47,981 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:47,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-30 00:44:47,982 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:47,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:47,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:47,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:47,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:48,001 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:48,007 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:48,008 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-30 00:44:48,323 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-30 00:44:48,323 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-30 00:44:48,328 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:48,328 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:48,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:48,335 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-30 00:44:48,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:48,349 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-30 00:44:48,359 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:48,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:48,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:48,536 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:48,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:48,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:48,582 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:48,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0fc6df0> has no local changes
2024-08-30 00:44:48,589 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:48,597 [ scc.git] DEBUG [detached HEAD 6df01ae] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:48,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:48,598 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:49,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-30 00:44:49,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-30 00:44:49,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-30 00:44:50,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-30 00:44:50,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-30 00:44:51,308 [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-30 00:44:51,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-30 00:44:52,097 [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-30 00:44:52,098 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-30 00:44:52,098 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:52,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-30 00:44:52,098 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:52,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:52,106 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:52,110 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:52,110 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:52,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:52,120 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:52,120 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-30 00:44:52,426 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-30 00:44:52,426 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-30 00:44:52,430 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:52,430 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:52,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:52,435 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-30 00:44:52,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:52,449 [ 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-30 00:44:52,458 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-30 00:44:52,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:44:52,461 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-30 00:44:52,461 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-30 00:44:52,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:52,591 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:52,631 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:52,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:52,637 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:52,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:52,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c077f340> has no local changes
2024-08-30 00:44:52,688 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:52,697 [ scc.git] DEBUG [detached HEAD 8bb0fd0] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:52,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:52,698 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:53,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-30 00:44:53,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-30 00:44:53,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-30 00:44:54,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-30 00:44:54,910 [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-30 00:44:55,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-30 00:44:55,906 [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-30 00:44:55,907 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-30 00:44:55,907 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:55,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-30 00:44:55,907 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:55,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:55,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:55,920 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:55,920 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:55,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:55,933 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:55,933 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-30 00:44:56,237 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-30 00:44:56,238 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-30 00:44:56,243 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:44:56,243 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:56,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:56,249 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-30 00:44:56,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:56,261 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-30 00:44:56,271 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG Auto-merging setup.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-30 00:44:56,272 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:44:56,272 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:44:56,279 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-30 00:44:56,286 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-30 00:44:56,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:44:56,422 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-30 00:44:56,429 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-30 00:44:56,435 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-08-30 00:44:56,442 [ scc.config] DEBUG Found github.token
2024-08-30 00:44:56,442 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-30 00:44:56,442 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:44:56,484 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:56,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:56,492 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:44:56,534 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:44:56,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c075cc40> has no local changes
2024-08-30 00:44:56,542 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:44:56,552 [ scc.git] DEBUG [detached HEAD 0e153ef] merge master -Dorg -Ssuccess-only
2024-08-30 00:44:56,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:44:56,553 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:44:56,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-30 00:44:57,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-30 00:44:57,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-30 00:44:58,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-30 00:44:58,720 [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-30 00:44:59,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-30 00:44:59,672 [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-30 00:44:59,673 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-30 00:44:59,673 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:44:59,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-30 00:44:59,673 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:44:59,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:44:59,680 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:44:59,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:44:59,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:44:59,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:44:59,700 [ scc.git] DEBUG Already up to date.
2024-08-30 00:44:59,700 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-30 00:44:59,996 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-30 00:44:59,996 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-30 00:45:00,001 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:00,001 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-30 00:45:00,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,021 [ 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-30 00:45:00,035 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-30 00:45:00,038 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-30 00:45:00,041 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-30 00:45:00,041 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-30 00:45:00,041 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-30 00:45:00,042 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-30 00:45:00,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:00,177 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:00,220 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,227 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:00,269 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:00,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c06d19d0> has no local changes
2024-08-30 00:45:00,278 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:00,289 [ scc.git] DEBUG [detached HEAD b2938a5] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:00,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:00,290 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:00,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-30 00:45:00,583 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:00,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-30 00:45:00,583 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,590 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:45:00,595 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:00,596 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:45:00,601 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:45:00,607 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:00,607 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:00,607 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,613 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:00,652 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,658 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:00,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:00,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0715a30> has no local changes
2024-08-30 00:45:00,703 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:00,711 [ scc.git] DEBUG [detached HEAD 11b61bf] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:00,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:00,712 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:00,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-30 00:45:00,987 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:00,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-30 00:45:00,987 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:00,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:00,993 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:45:00,998 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:00,998 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:45:01,004 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:45:01,010 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:01,010 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:01,010 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:01,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:01,014 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:01,055 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:01,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:01,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:01,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:01,109 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c072b460> has no local changes
2024-08-30 00:45:01,109 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:01,118 [ scc.git] DEBUG [detached HEAD 1d0915b] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:01,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:01,119 [ scc.git] INFO Overriding base-branch from master to main
2024-08-30 00:45:01,119 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:01,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-30 00:45:01,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-30 00:45:02,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-30 00:45:02,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-30 00:45:03,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-30 00:45:03,779 [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-30 00:45:04,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-30 00:45:04,608 [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-30 00:45:04,609 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-30 00:45:04,609 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:04,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-30 00:45:04,609 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:04,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:04,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-30 00:45:04,621 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:04,621 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-30 00:45:04,626 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-30 00:45:04,632 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:04,633 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-30 00:45:04,935 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-30 00:45:04,935 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-30 00:45:04,940 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:04,940 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:04,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:04,945 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-30 00:45:04,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:04,956 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-30 00:45:04,965 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-30 00:45:04,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-30 00:45:04,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:45:04,966 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:45:04,972 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-30 00:45:04,979 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-30 00:45:05,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:05,111 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-30 00:45:05,118 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-30 00:45:05,123 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-30 00:45:05,128 [ scc.config] DEBUG Found github.token
2024-08-30 00:45:05,129 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-30 00:45:05,129 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:05,169 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,175 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:05,215 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:05,226 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0704bb0> has no local changes
2024-08-30 00:45:05,226 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:05,238 [ scc.git] DEBUG [detached HEAD 47a39ee] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:05,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:05,238 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:05,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-30 00:45:05,517 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:05,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-30 00:45:05,517 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:45:05,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:05,530 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:45:05,537 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:45:05,544 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:05,544 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:05,544 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,550 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:05,594 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:05,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:05,643 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c0712eb0> has no local changes
2024-08-30 00:45:05,644 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:05,651 [ scc.git] DEBUG [detached HEAD 9580da0] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:05,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:05,652 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:05,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-30 00:45:05,924 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:05,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-30 00:45:05,925 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,930 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:45:05,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:05,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:45:05,939 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:45:05,944 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:05,944 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:05,944 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,948 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:05,987 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:05,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:05,993 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:06,037 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:06,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c06a9640> has no local changes
2024-08-30 00:45:06,044 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:06,053 [ scc.git] DEBUG [detached HEAD 15da0f7] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:06,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:06,054 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:06,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-30 00:45:06,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-30 00:45:07,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-30 00:45:07,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-30 00:45:08,219 [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-30 00:45:08,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-30 00:45:09,135 [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-30 00:45:09,136 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-30 00:45:09,137 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:09,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-30 00:45:09,137 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:09,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:09,145 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-30 00:45:09,151 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:09,151 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-30 00:45:09,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-30 00:45:09,166 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:09,167 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-30 00:45:09,501 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-30 00:45:09,502 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-30 00:45:09,507 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:09,507 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:09,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:09,513 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-30 00:45:09,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:09,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-30 00:45:09,536 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-30 00:45:09,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-30 00:45:09,536 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:45:09,537 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:45:09,543 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-30 00:45:09,551 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-30 00:45:09,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:09,679 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-30 00:45:09,685 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-30 00:45:09,691 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-30 00:45:09,696 [ scc.config] DEBUG Found github.token
2024-08-30 00:45:09,697 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-30 00:45:09,697 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:09,735 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:09,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:09,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:09,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:09,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c06f7c40> has no local changes
2024-08-30 00:45:09,786 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:09,795 [ scc.git] DEBUG [detached HEAD 1935ac5] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:09,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:09,796 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-30 00:45:09,796 [ scc.repo] DEBUG ## PRs found:
2024-08-30 00:45:10,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-30 00:45:10,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-30 00:45:11,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-30 00:45:11,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-30 00:45:12,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-30 00:45:12,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-30 00:45:12,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-30 00:45:13,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-30 00:45:13,918 [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-30 00:45:14,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-30 00:45:14,727 [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-30 00:45:14,729 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-30 00:45:15,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-30 00:45:15,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-30 00:45:16,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-30 00:45:16,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-30 00:45:16,602 [ scc.repo] DEBUG ## Branches found:
2024-08-30 00:45:16,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-30 00:45:16,602 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:16,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:16,611 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-30 00:45:16,620 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-30 00:45:16,621 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-30 00:45:16,631 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-30 00:45:16,640 [ scc.git] DEBUG Already up to date.
2024-08-30 00:45:16,641 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-30 00:45:16,980 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-30 00:45:16,980 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-30 00:45:16,985 [ scc.git] DEBUG ## Unique users: []
2024-08-30 00:45:16,985 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:16,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:16,992 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-30 00:45:17,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:17,009 [ 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-30 00:45:17,027 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-30 00:45:17,028 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-30 00:45:17,028 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-30 00:45:17,028 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-30 00:45:17,038 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-30 00:45:17,049 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-30 00:45:17,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:17,181 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-30 00:45:17,199 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-30 00:45:17,215 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#169](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-30 00:45:17,234 [ scc.config] DEBUG Found github.token
2024-08-30 00:45:17,234 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-30 00:45:17,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-30 00:45:17,300 [ scc.git] DEBUG Get sha1 of %s
2024-08-30 00:45:17,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-30 00:45:17,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:17,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:17,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c065f910> has no local changes
2024-08-30 00:45:17,358 [ 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:17,371 [ scc.git] DEBUG [detached HEAD 233f93c] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:17,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:17,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-30 00:45:17,468 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-30 00:45:17,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:17,638 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-30 00:45:17,645 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-30 00:45:18,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:18,030 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-30 00:45:18,038 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-30 00:45:18,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:18,422 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-30 00:45:18,430 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-30 00:45:18,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:18,815 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-30 00:45:19,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:19,194 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-30 00:45:19,199 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-30 00:45:19,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:19,583 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-30 00:45:19,589 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-30 00:45:19,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:19,967 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-30 00:45:19,973 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-30 00:45:20,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:20,356 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-30 00:45:20,361 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-30 00:45:20,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:20,768 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-30 00:45:20,776 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-30 00:45:21,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:21,160 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-30 00:45:21,166 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-30 00:45:21,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:21,545 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-30 00:45:21,550 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-30 00:45:21,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:21,921 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-30 00:45:21,925 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-30 00:45:22,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:22,321 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-30 00:45:22,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:22,724 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-30 00:45:23,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:23,121 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-30 00:45:23,129 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-30 00:45:23,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:23,505 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-30 00:45:23,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:23,896 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-30 00:45:24,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:24,281 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-30 00:45:24,287 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-30 00:45:24,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:24,665 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-30 00:45:24,670 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-30 00:45:25,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:25,049 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-30 00:45:25,054 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-30 00:45:25,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:25,435 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-30 00:45:25,440 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-30 00:45:25,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-30 00:45:25,831 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-30 00:45:25,831 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-30 00:45:25,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38c4ddee20> has local changes
2024-08-30 00:45:25,910 [ 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 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 560 will-moore 'Max projection bytes'
- 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#169 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/169/)'
2024-08-30 00:45:25,924 [ scc.git] DEBUG [detached HEAD e47582f] merge master -Dorg -Ssuccess-only
2024-08-30 00:45:25,924 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-30 00:45:25,924 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-30 00:45:25,925 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-30 00:45:25,925 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-30 00:45:25,925 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-30 00:45:25,925 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-30 00:45:25,925 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-30 00:45:25,925 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,925 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-30 00:45:25,925 [ scc.merge] INFO
2024-08-30 00:45:25,925 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-30 00:45:25,925 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-30 00:45:25,926 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-30 00:45:25,926 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (status: failure)
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-30 00:45:25,926 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-30 00:45:25,926 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,926 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,926 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-30 00:45:25,926 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,926 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-30 00:45:25,927 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-30 00:45:25,927 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-30 00:45:25,927 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-30 00:45:25,927 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-30 00:45:25,927 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-30 00:45:25,927 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-30 00:45:25,927 [ scc.merge] INFO
2024-08-30 00:45:25,927 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-30 00:45:25,927 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-30 00:45:25,928 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-30 00:45:25,928 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-30 00:45:25,928 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-30 00:45:25,928 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-30 00:45:25,928 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-30 00:45:25,928 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Merged PRs:
2024-08-30 00:45:25,928 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-30 00:45:25,928 [ scc.merge] INFO
2024-08-30 00:45:25,928 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-30 00:45:25,929 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-30 00:45:25,929 [ scc.merge] INFO
2024-08-30 00:45:25,929 [ scc.merge] INFO Repository: ome/scripts
2024-08-30 00:45:25,929 [ scc.merge] INFO Excluded PRs:
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-30 00:45:25,929 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-30 00:45:25,929 [ scc.merge] INFO Already up to date.
2024-08-30 00:45:25,930 [ scc.merge] INFO
2024-08-30 00:45:25,930 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-30 00:45:25,930 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-30 00:45:25,930 [ scc.merge] INFO
2024-08-30 00:45:25,930 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-30 00:45:25,930 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-30 00:45:25,935 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-30 00:45:25,940 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-30 00:45:25,944 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-30 00:45:25,949 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-30 00:45:25,954 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-30 00:45:25,958 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-30 00:45:25,963 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-30 00:45:25,967 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-30 00:45:25,972 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-30 00:45:25,976 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-30 00:45:25,981 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-30 00:45:25,986 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-30 00:45:25,990 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-30 00:45:25,995 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:25,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:25,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-30 00:45:25,999 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-30 00:45:26,004 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-30 00:45:26,009 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-30 00:45:26,013 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-30 00:45:26,018 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-30 00:45:26,022 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-30 00:45:26,027 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-30 00:45:26,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-30 00:45:26,032 [ scc.git] DEBUG Calling 'git remote'
2024-08-30 00:45:26,036 [ 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 7a43e3e] 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 2064aa6] 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-30 00:46:10,017 [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-30 00:46:18,668 [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-30 00:46:20,966 [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-30 00:46:25,390 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-30 00:47:04,007 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
