Console Output
Skipping 101 KB..
Full Lognel_model.js
2024-08-29 16:02:30,029 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-29 16:02:30,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:02:30,036 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-29 16:02:30,036 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-29 16:02:30,036 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/index.html | 1 +
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-29 16:02:30,036 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-29 16:02:30,037 [ scc.git] DEBUG src/templates/image_display_options.template.html | 6 ++-
2024-08-29 16:02:30,037 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-29 16:02:30,037 [ scc.git] DEBUG 14 files changed, 163 insertions(+), 16 deletions(-)
2024-08-29 16:02:30,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:30,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-29 16:02:30,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:30,281 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-29 16:02:30,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:02:30,299 [ scc.git] DEBUG setup.py | 2 +-
2024-08-29 16:02:30,299 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-29 16:02:30,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:30,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-29 16:02:30,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:30,662 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 578 (Image outline) 8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-29 16:02:30,686 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-29 16:02:30,686 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-29 16:02:30,686 [ scc.git] DEBUG Auto-merging src/js/views/panel_view.js
2024-08-29 16:02:30,686 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-29 16:02:30,686 [ scc.git] DEBUG Auto-merging src/templates/rois_form.template.html
2024-08-29 16:02:30,686 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/templates/rois_form.template.html
2024-08-29 16:02:30,686 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:02:30,687 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:02:30,693 [ scc.git] DEBUG Calling 'git reset --hard e9ef38a63496f3a1ca26df38085012bc095d72a5'
2024-08-29 16:02:30,702 [ scc.git] DEBUG HEAD is now at e9ef38a6 merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-08-29 16:02:31,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:31,036 [ scc.git] DEBUG Calling 'git merge-base cbdd365756caa80353d6b3ffd66259efbda098ee 8413745cd617bae91755b48eb35ecccc6c6a0acd'
2024-08-29 16:02:31,042 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..cbdd365756caa80353d6b3ffd66259efbda098ee'
2024-08-29 16:02:31,047 [ scc.git] INFO - PR 578 Rdornier 'Image outline'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/templates/rois_form.template.html
--conflicts
2024-08-29 16:02:31,051 [ scc.config] DEBUG Found github.token
2024-08-29 16:02:31,051 [ scc.git] DEBUG Adding comment to issue #578.
2024-08-29 16:02:31,740 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/578/comments HTTP/1.1" 201 1994
2024-08-29 16:02:31,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-29 16:02:31,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:31,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-29 16:02:31,784 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-29 16:02:31,784 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:02:31,789 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-08-29 16:02:31,789 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-08-29 16:02:31,789 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-08-29 16:02:31,789 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-08-29 16:02:31,789 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-08-29 16:02:31,789 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-08-29 16:02:32,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:32,159 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:02:32,195 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:32,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:32,199 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:02:32,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:02:32,243 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c6c2490> has no local changes
2024-08-29 16:02:32,243 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:02:32,251 [ scc.git] DEBUG [detached HEAD bdec34f4] merge master -Dorg -Ssuccess-only
2024-08-29 16:02:32,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:02:32,252 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:02:32,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-29 16:02:33,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-29 16:02:33,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-29 16:02:33,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-29 16:02:34,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:34,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-29 16:02:35,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:35,313 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-29 16:02:35,313 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:02:35,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-29 16:02:35,313 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:35,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:35,317 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:02:35,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:02:35,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:02:35,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:02:35,332 [ scc.git] DEBUG Already up to date.
2024-08-29 16:02:35,332 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-29 16:02:35,634 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-29 16:02:35,634 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-29 16:02:35,638 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:02:35,638 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:35,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:35,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-29 16:02:35,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:35,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-29 16:02:35,660 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-29 16:02:35,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:02:35,662 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-29 16:02:35,662 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-29 16:02:35,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:35,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:02:35,828 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:35,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:35,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:02:35,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:02:35,872 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92cf0beb0> has no local changes
2024-08-29 16:02:35,872 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:02:35,879 [ scc.git] DEBUG [detached HEAD 2b7678a] merge master -Dorg -Ssuccess-only
2024-08-29 16:02:35,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:02:35,880 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:02:36,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-29 16:02:36,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-29 16:02:36,702 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:02:37,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-29 16:02:37,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:38,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:38,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-29 16:02:39,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:39,234 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-29 16:02:39,234 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:02:39,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-29 16:02:39,234 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:39,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:39,239 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:02:39,243 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:02:39,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:02:39,248 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:02:39,253 [ scc.git] DEBUG Already up to date.
2024-08-29 16:02:39,253 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-29 16:02:39,584 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-29 16:02:39,584 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-29 16:02:39,588 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:02:39,588 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:39,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:39,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-29 16:02:39,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:39,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-29 16:02:39,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:02:39,615 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-29 16:02:39,615 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-29 16:02:39,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:02:39,752 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:02:39,787 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:39,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:39,792 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:02:39,826 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:02:39,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c6c2f70> has no local changes
2024-08-29 16:02:39,832 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:02:39,841 [ scc.git] DEBUG [detached HEAD ff6be70] merge master -Dorg -Ssuccess-only
2024-08-29 16:02:39,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:02:39,841 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:02:40,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-29 16:02:40,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-29 16:02:41,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-08-29 16:02:41,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-29 16:02:42,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:42,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:43,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-29 16:02:43,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:43,636 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-29 16:02:44,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-29 16:02:44,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-29 16:02:44,562 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:02:45,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-29 16:02:45,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:46,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:46,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-29 16:02:47,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:47,161 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-29 16:02:47,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-29 16:02:47,602 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:02:48,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-29 16:02:48,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:49,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:49,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-29 16:02:50,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:50,076 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-29 16:02:50,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-29 16:02:50,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-29 16:02:51,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-29 16:02:51,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:52,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:52,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-29 16:02:53,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:53,240 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-29 16:02:53,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-29 16:02:54,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-29 16:02:54,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-29 16:02:55,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:55,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:02:56,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-29 16:02:56,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:56,421 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-29 16:02:56,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-29 16:02:57,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-29 16:02:57,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-29 16:02:58,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:02:58,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-29 16:02:59,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:02:59,111 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-29 16:02:59,111 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:02:59,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-29 16:02:59,111 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:02:59,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:02:59,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:02:59,121 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:02:59,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:02:59,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:02:59,131 [ scc.git] DEBUG Already up to date.
2024-08-29 16:02:59,132 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-29 16:02:59,458 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:02:59,458 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-29 16:02:59,462 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-29 16:02:59,750 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:02:59,750 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-29 16:02:59,754 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-29 16:03:00,056 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:03:00,056 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-29 16:03:00,059 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-29 16:03:00,335 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:03:00,335 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-29 16:03:00,339 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-29 16:03:00,613 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:03:00,613 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-29 16:03:00,617 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-29 16:03:00,905 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-29 16:03:00,905 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-29 16:03:00,908 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:00,908 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:00,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:00,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-29 16:03:00,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:00,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-29 16:03:00,934 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-29 16:03:00,935 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:00,938 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-29 16:03:00,938 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-29 16:03:00,938 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-29 16:03:01,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:01,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-29 16:03:01,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:01,081 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-29 16:03:01,098 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-29 16:03:01,098 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-29 16:03:01,098 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-29 16:03:01,098 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-29 16:03:01,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:01,102 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-29 16:03:01,102 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-29 16:03:01,102 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-29 16:03:01,102 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-29 16:03:01,102 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-29 16:03:01,102 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-29 16:03:01,102 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-29 16:03:01,102 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-29 16:03:01,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:01,459 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-29 16:03:01,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:01,469 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-29 16:03:01,480 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-29 16:03:01,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:01,484 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-29 16:03:01,484 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-29 16:03:01,484 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-29 16:03:01,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:01,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-29 16:03:01,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:01,855 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-29 16:03:01,869 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:01,877 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-29 16:03:01,877 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-29 16:03:02,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:02,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-29 16:03:02,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:02,249 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-29 16:03:02,279 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 16:03:02,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:02,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:02,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-29 16:03:02,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:02,635 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-29 16:03:02,649 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-29 16:03:02,649 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-29 16:03:02,649 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-29 16:03:02,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-29 16:03:02,653 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-29 16:03:02,653 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-29 16:03:03,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:03,002 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:03,040 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:03,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:03,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:03,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:03,087 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c6deb80> has no local changes
2024-08-29 16:03:03,087 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:03,096 [ scc.git] DEBUG [detached HEAD 7ae472f] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:03,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:03,097 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:03,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-29 16:03:03,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-29 16:03:04,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-29 16:03:04,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-29 16:03:05,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:05,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:03:06,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-29 16:03:06,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:06,647 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-29 16:03:06,647 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:06,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-29 16:03:06,647 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:06,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:06,653 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:06,657 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:06,657 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:06,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:06,667 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:06,667 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-29 16:03:07,000 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-29 16:03:07,000 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-29 16:03:07,004 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:07,004 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:07,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:07,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-29 16:03:07,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:07,019 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-29 16:03:07,028 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:07,030 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-29 16:03:07,030 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-29 16:03:07,030 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-29 16:03:07,030 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-29 16:03:07,030 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-29 16:03:07,030 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-29 16:03:07,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:07,160 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:07,196 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:07,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:07,201 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:07,236 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:07,242 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c685730> has no local changes
2024-08-29 16:03:07,242 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:07,250 [ scc.git] DEBUG [detached HEAD f759633] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:07,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:07,250 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:07,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-29 16:03:08,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-08-29 16:03:08,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-29 16:03:09,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:09,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-29 16:03:09,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:09,998 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-08-29 16:03:10,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-29 16:03:11,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-29 16:03:11,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-29 16:03:12,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:12,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-29 16:03:12,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:12,861 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-29 16:03:13,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-29 16:03:13,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-29 16:03:14,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-29 16:03:14,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:15,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-29 16:03:15,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:15,879 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-29 16:03:15,879 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:15,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-29 16:03:15,879 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:15,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:15,885 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:15,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:15,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:15,895 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:15,899 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:15,900 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-29 16:03:16,223 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 16:03:16,223 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-29 16:03:16,227 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-29 16:03:16,501 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 16:03:16,501 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-29 16:03:16,505 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-08-29 16:03:16,786 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-29 16:03:16,786 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-08-29 16:03:16,790 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:16,790 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:16,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:16,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-29 16:03:16,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:16,805 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-29 16:03:16,819 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-29 16:03:16,819 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-29 16:03:16,819 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-29 16:03:16,819 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-29 16:03:16,819 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:03:16,819 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:03:16,824 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 16:03:16,830 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-29 16:03:16,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:16,969 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-29 16:03:16,975 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 16:03:16,980 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-29 16:03:16,984 [ scc.config] DEBUG Found github.token
2024-08-29 16:03:16,984 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-29 16:03:16,984 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-29 16:03:16,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:16,995 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-29 16:03:17,009 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-29 16:03:17,009 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-29 16:03:17,009 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-29 16:03:17,010 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:03:17,010 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:03:17,015 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 16:03:17,021 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-29 16:03:17,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:17,368 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-29 16:03:17,374 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-29 16:03:17,379 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-29 16:03:17,383 [ scc.config] DEBUG Found github.token
2024-08-29 16:03:17,383 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-29 16:03:17,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-29 16:03:17,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:17,393 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-29 16:03:17,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:17,404 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-08-29 16:03:17,404 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-08-29 16:03:17,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:17,804 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:17,841 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:17,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:17,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:17,880 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:17,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c685550> has no local changes
2024-08-29 16:03:17,886 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:17,894 [ scc.git] DEBUG [detached HEAD 38b7ad6] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:17,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:17,894 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:18,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-29 16:03:18,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-29 16:03:18,860 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:03:19,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-29 16:03:20,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:20,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:03:21,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-29 16:03:21,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:21,541 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-29 16:03:21,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-29 16:03:22,001 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:03:22,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-29 16:03:23,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:23,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:03:24,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-29 16:03:24,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:24,426 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-29 16:03:24,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-29 16:03:24,892 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-29 16:03:25,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-29 16:03:26,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:26,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-29 16:03:26,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-29 16:03:27,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:27,364 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-29 16:03:27,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-29 16:03:28,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-29 16:03:28,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-29 16:03:29,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-29 16:03:29,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-29 16:03:30,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-29 16:03:30,179 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:30,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-29 16:03:30,179 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:30,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:30,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:30,189 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:30,189 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:30,194 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:30,199 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:30,199 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-29 16:03:30,548 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 16:03:30,549 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-29 16:03:30,552 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-29 16:03:30,838 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 16:03:30,838 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-29 16:03:30,843 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-29 16:03:31,128 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-29 16:03:31,129 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-29 16:03:31,132 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:31,132 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:31,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:31,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-29 16:03:31,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:31,146 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-29 16:03:31,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:31,157 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-29 16:03:31,157 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-29 16:03:31,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:31,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-29 16:03:31,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:31,324 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-29 16:03:31,335 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 16:03:31,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:31,338 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-29 16:03:31,338 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-29 16:03:31,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:31,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-29 16:03:31,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:31,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-29 16:03:31,715 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-29 16:03:31,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:31,719 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-29 16:03:31,719 [ scc.git] DEBUG package.json | 2 +-
2024-08-29 16:03:31,719 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-29 16:03:32,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:32,123 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:32,159 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:32,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:32,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:32,200 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:32,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c6d6c40> has no local changes
2024-08-29 16:03:32,206 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:32,214 [ scc.git] DEBUG [detached HEAD 4cb2818] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:32,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:32,214 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:32,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-29 16:03:33,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-29 16:03:33,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-29 16:03:34,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:34,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-29 16:03:34,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:34,903 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-29 16:03:34,903 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:34,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-29 16:03:34,903 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:34,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:34,909 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:34,914 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:34,914 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:34,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:34,924 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:34,924 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-29 16:03:35,216 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-29 16:03:35,216 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-29 16:03:35,220 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:35,220 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:35,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:35,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-29 16:03:35,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:35,235 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-29 16:03:35,243 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:35,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:35,384 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:35,420 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:35,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:35,425 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:35,460 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:35,465 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c63c9d0> has no local changes
2024-08-29 16:03:35,465 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:35,472 [ scc.git] DEBUG [detached HEAD e2e2648] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:35,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:35,473 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:35,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-29 16:03:36,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-29 16:03:36,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-29 16:03:37,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-29 16:03:37,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-29 16:03:38,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:38,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-29 16:03:39,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:39,003 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-29 16:03:39,003 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:39,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-29 16:03:39,003 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:39,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:39,009 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:39,013 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:39,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:39,018 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:39,023 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:39,023 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-29 16:03:39,321 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-29 16:03:39,321 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-29 16:03:39,325 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:39,325 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:39,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:39,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-29 16:03:39,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:39,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-29 16:03:39,349 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-29 16:03:39,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:39,352 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-29 16:03:39,352 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-29 16:03:39,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:39,503 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:39,538 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:39,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:39,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:39,577 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:39,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c696bb0> has no local changes
2024-08-29 16:03:39,582 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:39,590 [ scc.git] DEBUG [detached HEAD a675b6b] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:39,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:39,590 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:39,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-29 16:03:40,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-29 16:03:40,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-29 16:03:41,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-29 16:03:41,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:42,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-29 16:03:42,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:42,731 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-29 16:03:42,731 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:42,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-29 16:03:42,731 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:42,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:42,737 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:42,741 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:42,742 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:42,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:42,751 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:42,752 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-29 16:03:43,053 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-29 16:03:43,053 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-29 16:03:43,057 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:43,057 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:43,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:43,062 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 16:03:43,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:43,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 16:03:43,081 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG Auto-merging setup.py
2024-08-29 16:03:43,081 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-29 16:03:43,082 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:03:43,082 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:03:43,086 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-29 16:03:43,092 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-29 16:03:43,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:43,252 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-29 16:03:43,258 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-29 16:03:43,262 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-08-29 16:03:43,267 [ scc.config] DEBUG Found github.token
2024-08-29 16:03:43,267 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-29 16:03:43,267 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:43,302 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:43,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:43,307 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:43,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:43,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c64e460> has no local changes
2024-08-29 16:03:43,348 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:43,355 [ scc.git] DEBUG [detached HEAD ace1d66] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:43,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:43,356 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:43,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-29 16:03:44,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-29 16:03:44,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-29 16:03:45,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-29 16:03:45,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:46,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-29 16:03:46,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:46,556 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-29 16:03:46,556 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:46,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-29 16:03:46,556 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:46,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:46,562 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:46,567 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:46,567 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:46,573 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:46,578 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:46,578 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-29 16:03:46,878 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-29 16:03:46,878 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-29 16:03:46,881 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:46,881 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:46,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:46,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-29 16:03:46,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:46,898 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-29 16:03:46,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-29 16:03:46,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-29 16:03:46,916 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-29 16:03:46,916 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-29 16:03:46,916 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-29 16:03:46,917 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-29 16:03:46,917 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-29 16:03:46,917 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-29 16:03:47,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:47,084 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:47,122 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,127 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:47,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:47,168 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c5f5880> has no local changes
2024-08-29 16:03:47,168 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:47,175 [ scc.git] DEBUG [detached HEAD 94501cc] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:47,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:47,176 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:47,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-29 16:03:47,512 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:47,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-29 16:03:47,512 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,517 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:47,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:47,521 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:47,526 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:47,531 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:47,531 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:47,531 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,536 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:47,571 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:47,610 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:47,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c649f10> has no local changes
2024-08-29 16:03:47,616 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:47,623 [ scc.git] DEBUG [detached HEAD 8a7428f] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:47,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:47,623 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:47,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-29 16:03:47,944 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:47,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-29 16:03:47,944 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:47,953 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:47,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:47,958 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:47,963 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:47,963 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:47,963 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:47,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:47,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:48,003 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:48,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:48,008 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:48,042 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:48,048 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c5f56a0> has no local changes
2024-08-29 16:03:48,048 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:48,055 [ scc.git] DEBUG [detached HEAD d48e973] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:48,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:48,056 [ scc.git] INFO Overriding base-branch from master to main
2024-08-29 16:03:48,056 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:48,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-29 16:03:48,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-29 16:03:49,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-29 16:03:49,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-29 16:03:50,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-29 16:03:50,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:51,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-29 16:03:51,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:51,585 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-29 16:03:51,585 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:51,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-29 16:03:51,585 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:51,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:51,591 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-29 16:03:51,595 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:51,595 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-29 16:03:51,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-29 16:03:51,605 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:51,605 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-29 16:03:51,905 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-29 16:03:51,905 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-29 16:03:51,909 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:51,909 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:51,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:51,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 16:03:51,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:51,924 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 16:03:51,933 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-29 16:03:51,933 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-29 16:03:51,933 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:03:51,933 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:03:51,938 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-29 16:03:51,943 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-29 16:03:52,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:52,092 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-29 16:03:52,097 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-29 16:03:52,101 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-29 16:03:52,106 [ scc.config] DEBUG Found github.token
2024-08-29 16:03:52,106 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-29 16:03:52,106 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:52,142 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,146 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:52,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:52,187 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c626670> has no local changes
2024-08-29 16:03:52,187 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:52,194 [ scc.git] DEBUG [detached HEAD dbfadb5] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:52,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:52,195 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:52,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-29 16:03:52,510 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:52,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-29 16:03:52,510 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,514 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:52,519 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:52,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:52,524 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:52,528 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:52,529 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:52,529 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,533 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:52,568 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:52,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:52,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c616e80> has no local changes
2024-08-29 16:03:52,612 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:52,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:52,620 [ scc.git] DEBUG [detached HEAD 6977b48] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:52,620 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:52,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-29 16:03:52,938 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:52,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-29 16:03:52,939 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:52,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:52,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:52,953 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:52,958 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:52,959 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:52,959 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:52,963 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:52,999 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:52,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:53,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:53,040 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:53,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c5cc640> has no local changes
2024-08-29 16:03:53,045 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:53,053 [ scc.git] DEBUG [detached HEAD c71dc1d] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:53,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:53,053 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:53,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-29 16:03:53,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-29 16:03:54,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-29 16:03:54,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-29 16:03:55,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:03:55,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-29 16:03:56,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:03:56,115 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-29 16:03:56,115 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:03:56,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-29 16:03:56,116 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:56,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:56,121 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-29 16:03:56,126 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:03:56,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-29 16:03:56,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-29 16:03:56,136 [ scc.git] DEBUG Already up to date.
2024-08-29 16:03:56,136 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-29 16:03:56,424 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-29 16:03:56,424 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-29 16:03:56,428 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:03:56,428 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:56,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:56,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 16:03:56,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:56,442 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 16:03:56,451 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-29 16:03:56,451 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-29 16:03:56,451 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:03:56,452 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:03:56,456 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-29 16:03:56,463 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-29 16:03:56,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:03:56,618 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-29 16:03:56,623 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-29 16:03:56,628 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-29 16:03:56,632 [ scc.config] DEBUG Found github.token
2024-08-29 16:03:56,632 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-29 16:03:56,632 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:03:56,668 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:03:56,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:03:56,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:03:56,708 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:03:56,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c5ddd90> has no local changes
2024-08-29 16:03:56,714 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:03:56,722 [ scc.git] DEBUG [detached HEAD 20e4e05] merge master -Dorg -Ssuccess-only
2024-08-29 16:03:56,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:03:56,722 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-29 16:03:56,722 [ scc.repo] DEBUG ## PRs found:
2024-08-29 16:03:57,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-29 16:03:57,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-29 16:03:58,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-29 16:03:58,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-29 16:03:59,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-29 16:03:59,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-29 16:04:00,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-29 16:04:00,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-29 16:04:01,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-29 16:04:01,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-29 16:04:01,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-29 16:04:01,976 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-29 16:04:02,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-29 16:04:02,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-29 16:04:03,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-29 16:04:03,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-29 16:04:03,965 [ scc.repo] DEBUG ## Branches found:
2024-08-29 16:04:03,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-29 16:04:03,965 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:04:03,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:04:03,970 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-29 16:04:03,975 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-29 16:04:03,975 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-29 16:04:03,980 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-29 16:04:03,985 [ scc.git] DEBUG Already up to date.
2024-08-29 16:04:03,985 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-29 16:04:04,298 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-29 16:04:04,298 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-29 16:04:04,302 [ scc.git] DEBUG ## Unique users: []
2024-08-29 16:04:04,302 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:04:04,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:04:04,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-29 16:04:04,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:04:04,318 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-29 16:04:04,327 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-29 16:04:04,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-29 16:04:04,328 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-29 16:04:04,328 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-29 16:04:04,333 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-29 16:04:04,338 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-29 16:04:04,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:04,481 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-29 16:04:04,487 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-29 16:04:04,492 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#168](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-29 16:04:04,496 [ scc.config] DEBUG Found github.token
2024-08-29 16:04:04,497 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-29 16:04:04,497 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-29 16:04:04,532 [ scc.git] DEBUG Get sha1 of %s
2024-08-29 16:04:04,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-29 16:04:04,537 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:04:04,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:04:04,576 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92c617e20> has no local changes
2024-08-29 16:04:04,576 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:04:04,584 [ scc.git] DEBUG [detached HEAD ea107f7] merge master -Dorg -Ssuccess-only
2024-08-29 16:04:04,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:04,585 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-29 16:04:04,653 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-29 16:04:04,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:04,877 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-29 16:04:04,881 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-29 16:04:05,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:05,264 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-29 16:04:05,268 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-29 16:04:05,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:05,704 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-29 16:04:05,709 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-29 16:04:06,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:06,103 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-29 16:04:06,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:06,496 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-29 16:04:06,500 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-29 16:04:06,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:06,885 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-29 16:04:06,889 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-29 16:04:07,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:07,275 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-29 16:04:07,279 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-29 16:04:07,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:07,665 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-29 16:04:07,669 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-29 16:04:08,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:08,045 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-29 16:04:08,049 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-29 16:04:08,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:08,429 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-29 16:04:08,433 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-29 16:04:08,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:08,816 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-29 16:04:08,820 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-29 16:04:09,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:09,207 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-29 16:04:09,211 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-29 16:04:09,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:09,619 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-29 16:04:10,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:10,014 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-29 16:04:10,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:10,396 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-29 16:04:10,400 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-29 16:04:10,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:10,791 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-29 16:04:11,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:11,173 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-29 16:04:11,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:11,569 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-29 16:04:11,573 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-29 16:04:11,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:11,964 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-29 16:04:11,969 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-29 16:04:12,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:12,403 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-29 16:04:12,407 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-29 16:04:12,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:12,782 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-29 16:04:12,786 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-29 16:04:13,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-29 16:04:13,176 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-29 16:04:13,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-29 16:04:13,250 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa92e02e760> has local changes
2024-08-29 16:04:13,250 [ 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#168 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/168/)'
2024-08-29 16:04:13,263 [ scc.git] DEBUG [detached HEAD 8655fca] merge master -Dorg -Ssuccess-only
2024-08-29 16:04:13,263 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-29 16:04:13,263 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-29 16:04:13,263 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,263 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,263 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,263 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-29 16:04:13,263 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,263 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,263 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,263 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-29 16:04:13,263 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,263 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-29 16:04:13,263 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,263 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,263 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-29 16:04:13,263 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-29 16:04:13,264 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-29 16:04:13,264 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-29 16:04:13,264 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-29 16:04:13,264 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-29 16:04:13,264 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (status: failure)
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-29 16:04:13,264 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-08-29 16:04:13,264 [ scc.merge] INFO
2024-08-29 16:04:13,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,264 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-29 16:04:13,265 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-29 16:04:13,265 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-29 16:04:13,265 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-29 16:04:13,265 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-29 16:04:13,265 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-29 16:04:13,265 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,265 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,265 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-29 16:04:13,265 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,265 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-29 16:04:13,266 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-29 16:04:13,266 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-29 16:04:13,266 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-29 16:04:13,266 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-29 16:04:13,266 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-29 16:04:13,266 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,266 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-29 16:04:13,266 [ scc.merge] INFO
2024-08-29 16:04:13,266 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Merged PRs:
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-29 16:04:13,267 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-29 16:04:13,267 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-29 16:04:13,267 [ scc.merge] INFO
2024-08-29 16:04:13,267 [ scc.merge] INFO Repository: ome/scripts
2024-08-29 16:04:13,267 [ scc.merge] INFO Excluded PRs:
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-29 16:04:13,267 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-29 16:04:13,268 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-29 16:04:13,268 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-29 16:04:13,268 [ scc.merge] INFO Already up to date.
2024-08-29 16:04:13,268 [ scc.merge] INFO
2024-08-29 16:04:13,268 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-29 16:04:13,268 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-29 16:04:13,268 [ scc.merge] INFO
2024-08-29 16:04:13,268 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-29 16:04:13,268 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-29 16:04:13,272 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-29 16:04:13,277 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-29 16:04:13,281 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-29 16:04:13,286 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-29 16:04:13,290 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-29 16:04:13,295 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-29 16:04:13,299 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-29 16:04:13,304 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-29 16:04:13,309 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-29 16:04:13,313 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-29 16:04:13,318 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-29 16:04:13,322 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-29 16:04:13,327 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-29 16:04:13,331 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-29 16:04:13,336 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-29 16:04:13,341 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-29 16:04:13,345 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-29 16:04:13,349 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-29 16:04:13,354 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-29 16:04:13,358 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-29 16:04:13,363 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-29 16:04:13,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-29 16:04:13,368 [ scc.git] DEBUG Calling 'git remote'
2024-08-29 16:04:13,372 [ 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 96f7c65] 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 10468b7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-29 16:04:56,464 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-29 16:05:05,504 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-29 16:05:07,866 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-29 16:05:12,435 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-29 16:05:52,683 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
