Console Output
Skipping 103 KB..
Full Logtests_require in setup.py)
2024-09-04 00:41:58,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:41:58,708 [ scc.git] DEBUG Calling 'git merge-base 5f623996a1906632e0ff91ce399a733d139a59d7 46dbf915ab2295b6f74c772a4168d6b29d78dd37'
2024-09-04 00:41:58,714 [ scc.git] DEBUG Calling 'git diff --name-only 5f623996a1906632e0ff91ce399a733d139a59d7..5f623996a1906632e0ff91ce399a733d139a59d7'
2024-09-04 00:41:58,719 [ scc.git] INFO - PR 578 Rdornier 'Image outline'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/templates/rois_form.template.html
--conflicts
2024-09-04 00:41:58,723 [ scc.config] DEBUG Found github.token
2024-09-04 00:41:58,723 [ scc.git] DEBUG Adding comment to issue #578.
2024-09-04 00:41:59,780 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/578/comments HTTP/1.1" 201 1994
2024-09-04 00:41:59,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-04 00:41:59,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:41:59,792 [ 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-09-04 00:42:00,026 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-04 00:42:00,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:00,030 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-04 00:42:00,030 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-04 00:42:00,030 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-04 00:42:00,030 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-04 00:42:00,030 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-04 00:42:00,030 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-04 00:42:00,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:00,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-04 00:42:00,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:00,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 584 (Link url to image) dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-04 00:42:00,192 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-09-04 00:42:00,192 [ scc.git] DEBUG Auto-merging src/js/views/figure_view.js
2024-09-04 00:42:00,193 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:00,196 [ scc.git] DEBUG .gitignore | 2 +
2024-09-04 00:42:00,197 [ scc.git] DEBUG omero_figure/views.py | 130 ++++++++++++++++++++++++++++++++++++------
2024-09-04 00:42:00,197 [ scc.git] DEBUG src/js/models/figure_model.js | 10 ++--
2024-09-04 00:42:00,197 [ scc.git] DEBUG src/js/views/figure_view.js | 10 ++--
2024-09-04 00:42:00,197 [ scc.git] DEBUG 4 files changed, 126 insertions(+), 26 deletions(-)
2024-09-04 00:42:00,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:00,538 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:00,572 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:00,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:00,577 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:00,612 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:00,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940cdac0> has no local changes
2024-09-04 00:42:00,620 [ 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 543 will-moore 'Plate well labels' (exclude comment)
Updating b540416f..5f623996
Previously merged:
- PR 585 will-moore 'Changelog 7.1.0'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
Generated by OMERO-plugins-push#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:00,630 [ scc.git] DEBUG [detached HEAD 7947ea9d] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:00,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:00,630 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:01,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-04 00:42:01,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-04 00:42:01,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-04 00:42:02,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-04 00:42:02,904 [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-09-04 00:42:03,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-04 00:42:03,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:03,870 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-04 00:42:03,870 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:42:03,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-04 00:42:03,871 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:03,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:03,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:42:03,879 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:42:03,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:42:03,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:42:03,888 [ scc.git] DEBUG Already up to date.
2024-09-04 00:42:03,889 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-04 00:42:04,260 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-04 00:42:04,260 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-04 00:42:04,264 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:42:04,264 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:04,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:04,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-04 00:42:04,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:04,278 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-04 00:42:04,286 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-04 00:42:04,287 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:04,289 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-04 00:42:04,289 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-04 00:42:04,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:04,434 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:04,469 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:04,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:04,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:04,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:04,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940cdb50> has no local changes
2024-09-04 00:42:04,512 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:04,519 [ scc.git] DEBUG [detached HEAD 55a39f6] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:04,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:04,520 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:04,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-04 00:42:05,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-04 00:42:05,333 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:05,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-04 00:42:06,376 [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-09-04 00:42:06,857 [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-09-04 00:42:07,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-04 00:42:07,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:07,908 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-04 00:42:07,908 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:42:07,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-04 00:42:07,908 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:07,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:07,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:42:07,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:42:07,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:42:07,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:42:07,926 [ scc.git] DEBUG Already up to date.
2024-09-04 00:42:07,926 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-04 00:42:08,228 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-04 00:42:08,228 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-04 00:42:08,232 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:42:08,232 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:08,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:08,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-04 00:42:08,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:08,245 [ 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-09-04 00:42:08,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:08,258 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-04 00:42:08,258 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-04 00:42:08,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:08,398 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:08,432 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:08,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:08,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:08,470 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:08,476 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940cda60> has no local changes
2024-09-04 00:42:08,476 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:08,484 [ scc.git] DEBUG [detached HEAD 8686771] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:08,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:08,485 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:09,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-04 00:42:09,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-04 00:42:09,474 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:10,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-04 00:42:10,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:42:10,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:42:11,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-04 00:42:11,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:11,920 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-04 00:42:12,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-04 00:42:12,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-04 00:42:13,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-04 00:42:13,745 [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-09-04 00:42:14,176 [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-09-04 00:42:14,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-04 00:42:15,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:15,055 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-04 00:42:15,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-04 00:42:15,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-04 00:42:15,963 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:16,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-04 00:42:17,007 [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-09-04 00:42:17,532 [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-09-04 00:42:18,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-04 00:42:18,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:18,516 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-04 00:42:18,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-04 00:42:18,955 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:19,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-04 00:42:20,020 [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-09-04 00:42:20,524 [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-09-04 00:42:20,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-04 00:42:21,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:21,332 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-04 00:42:21,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-04 00:42:22,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-04 00:42:22,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-04 00:42:23,334 [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-09-04 00:42:23,786 [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-09-04 00:42:24,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-04 00:42:24,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:24,677 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-04 00:42:25,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-04 00:42:25,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-04 00:42:26,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-04 00:42:26,595 [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-09-04 00:42:27,067 [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-09-04 00:42:27,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-04 00:42:27,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:27,953 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-04 00:42:28,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-04 00:42:28,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-04 00:42:29,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-04 00:42:29,796 [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-09-04 00:42:30,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-04 00:42:30,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:30,621 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-04 00:42:30,622 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:42:30,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-04 00:42:30,622 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:30,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:30,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:42:30,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:42:30,632 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:42:31,074 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:42:31,079 [ scc.git] DEBUG Already up to date.
2024-09-04 00:42:31,079 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-04 00:42:31,789 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:31,789 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-04 00:42:31,794 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-04 00:42:33,157 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:33,157 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-04 00:42:33,162 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-04 00:42:33,480 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:33,480 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-04 00:42:33,484 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-04 00:42:33,797 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:33,797 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-04 00:42:33,802 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-04 00:42:34,076 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:34,076 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-04 00:42:34,080 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-04 00:42:34,837 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:34,837 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-04 00:42:34,842 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-04 00:42:35,120 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-04 00:42:35,120 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-04 00:42:35,125 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:42:35,125 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:35,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:35,129 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-04 00:42:35,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:35,139 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-04 00:42:35,364 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-04 00:42:35,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:35,368 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-04 00:42:35,368 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-04 00:42:35,368 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-04 00:42:35,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:35,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-04 00:42:35,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:35,521 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-04 00:42:35,649 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-04 00:42:35,649 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-04 00:42:35,649 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-04 00:42:35,649 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-04 00:42:35,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:35,653 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-04 00:42:35,653 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-04 00:42:35,653 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-04 00:42:35,654 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-04 00:42:35,654 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-04 00:42:35,654 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-04 00:42:35,654 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-04 00:42:35,654 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-04 00:42:35,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:35,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-04 00:42:35,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:35,904 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-04 00:42:35,973 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-04 00:42:35,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:35,976 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-04 00:42:35,976 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-04 00:42:35,976 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-04 00:42:36,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:36,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-04 00:42:36,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:36,350 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-04 00:42:36,478 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:36,486 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-04 00:42:36,486 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-04 00:42:36,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:36,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-04 00:42:36,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:36,725 [ 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-09-04 00:42:36,811 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-04 00:42:36,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:37,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:37,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-04 00:42:37,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:37,057 [ 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-09-04 00:42:37,290 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-04 00:42:37,290 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-04 00:42:37,290 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-04 00:42:37,291 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:37,294 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-04 00:42:37,295 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-04 00:42:37,295 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-04 00:42:37,295 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-04 00:42:37,295 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-04 00:42:37,295 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-04 00:42:37,295 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-04 00:42:37,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:37,434 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-04 00:42:37,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:37,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-04 00:42:37,573 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-04 00:42:37,574 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:37,583 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-04 00:42:37,583 [ scc.git] DEBUG package.json | 2 +-
2024-09-04 00:42:37,583 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-04 00:42:37,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:37,819 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:37,854 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:37,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:37,859 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:37,893 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:37,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940edbb0> has no local changes
2024-09-04 00:42:37,902 [ 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'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:37,913 [ scc.git] DEBUG [detached HEAD f3ca492] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:37,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:37,914 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:38,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-04 00:42:38,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-04 00:42:39,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-04 00:42:39,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-04 00:42:40,255 [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-09-04 00:42:40,720 [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-09-04 00:42:41,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-04 00:42:41,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:41,542 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-04 00:42:41,542 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:42:41,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-04 00:42:41,542 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:41,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:41,547 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:42:41,552 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:42:41,552 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:42:41,557 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:42:41,561 [ scc.git] DEBUG Already up to date.
2024-09-04 00:42:41,562 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-04 00:42:41,873 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-04 00:42:41,873 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-04 00:42:41,877 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:42:41,877 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:41,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:41,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-04 00:42:41,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:41,891 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-04 00:42:41,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:41,902 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-04 00:42:41,902 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-04 00:42:41,902 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-04 00:42:41,902 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-04 00:42:41,902 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-04 00:42:41,902 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-04 00:42:42,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:42,038 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:42,073 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:42,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:42,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:42,111 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:42,116 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940947f0> has no local changes
2024-09-04 00:42:42,117 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:42,124 [ scc.git] DEBUG [detached HEAD d6d9095] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:42,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:42,124 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:42,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-04 00:42:43,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-04 00:42:43,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-04 00:42:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-04 00:42:44,410 [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-09-04 00:42:44,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-04 00:42:45,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:45,294 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-04 00:42:45,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-04 00:42:46,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-04 00:42:46,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-04 00:42:47,164 [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-09-04 00:42:47,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-04 00:42:47,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:47,963 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-04 00:42:48,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-04 00:42:48,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-04 00:42:49,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-04 00:42:49,781 [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-09-04 00:42:50,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-04 00:42:50,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:50,591 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-04 00:42:50,591 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:42:50,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-04 00:42:50,592 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:50,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:50,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:42:50,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:42:50,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:42:50,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:42:50,611 [ scc.git] DEBUG Already up to date.
2024-09-04 00:42:50,611 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-04 00:42:51,367 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-04 00:42:51,367 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-04 00:42:51,370 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-04 00:42:51,856 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-04 00:42:51,856 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-04 00:42:51,860 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-04 00:42:52,134 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-04 00:42:52,134 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-04 00:42:52,137 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:42:52,137 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:52,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:52,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-04 00:42:52,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:52,152 [ 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-09-04 00:42:52,205 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-04 00:42:52,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-04 00:42:52,205 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-04 00:42:52,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-04 00:42:52,205 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:42:52,205 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:42:52,210 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-04 00:42:52,215 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-04 00:42:52,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:52,351 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-04 00:42:52,356 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-04 00:42:52,361 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-04 00:42:52,365 [ scc.config] DEBUG Found github.token
2024-09-04 00:42:52,365 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-04 00:42:52,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-04 00:42:52,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:52,376 [ 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-09-04 00:42:52,440 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-04 00:42:52,440 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-04 00:42:52,440 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-04 00:42:52,440 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:42:52,440 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:42:52,445 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-04 00:42:52,452 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-04 00:42:52,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:52,729 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-04 00:42:52,735 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-04 00:42:52,740 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/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-09-04 00:42:52,745 [ scc.config] DEBUG Found github.token
2024-09-04 00:42:52,745 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-04 00:42:52,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-04 00:42:52,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:52,754 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-04 00:42:52,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:42:52,766 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-04 00:42:52,766 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-04 00:42:53,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:42:53,110 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:42:53,145 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:42:53,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:42:53,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:42:53,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:42:53,189 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940945b0> has no local changes
2024-09-04 00:42:53,189 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:42:53,196 [ scc.git] DEBUG [detached HEAD cb7f359] merge master -Dorg -Ssuccess-only
2024-09-04 00:42:53,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:42:53,197 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:42:53,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-04 00:42:54,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-04 00:42:54,112 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:54,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-04 00:42:55,195 [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-09-04 00:42:55,767 [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-09-04 00:42:56,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-04 00:42:56,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:56,617 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-04 00:42:57,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-04 00:42:57,053 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:42:57,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-04 00:42:58,119 [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-09-04 00:42:58,559 [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-09-04 00:42:59,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-04 00:42:59,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:42:59,563 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-04 00:43:00,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-04 00:43:00,011 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:43:00,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-04 00:43:01,082 [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-09-04 00:43:01,553 [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-09-04 00:43:02,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-04 00:43:02,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:43:02,468 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-04 00:43:02,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-04 00:43:03,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-04 00:43:03,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-04 00:43:04,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-04 00:43:04,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-04 00:43:05,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-04 00:43:05,265 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:05,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-04 00:43:05,265 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:05,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:05,270 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:05,274 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:05,275 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:05,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:05,284 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:05,284 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-04 00:43:05,608 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-04 00:43:05,608 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-04 00:43:05,611 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-04 00:43:05,891 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-04 00:43:05,891 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-04 00:43:05,894 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-04 00:43:06,168 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-04 00:43:06,168 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-04 00:43:06,171 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:06,171 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:06,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:06,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-04 00:43:06,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:06,186 [ 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-09-04 00:43:06,195 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:06,197 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-04 00:43:06,197 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-04 00:43:06,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:06,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-04 00:43:06,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:06,338 [ 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-09-04 00:43:06,442 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-04 00:43:06,443 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:06,445 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-04 00:43:06,445 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-04 00:43:06,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:06,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-04 00:43:06,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:06,745 [ 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-09-04 00:43:06,755 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-04 00:43:06,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:06,758 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-04 00:43:06,758 [ scc.git] DEBUG package.json | 2 +-
2024-09-04 00:43:06,758 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-04 00:43:07,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:07,139 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:07,173 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:07,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:07,178 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:07,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:07,217 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940ddc70> has no local changes
2024-09-04 00:43:07,217 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:07,224 [ scc.git] DEBUG [detached HEAD b228604] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:07,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:07,225 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:07,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-04 00:43:08,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-04 00:43:08,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-04 00:43:08,997 [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-09-04 00:43:09,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-04 00:43:09,892 [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-09-04 00:43:09,892 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-04 00:43:09,893 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:09,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-04 00:43:09,893 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:09,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:09,897 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:09,901 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:09,901 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:09,906 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:09,911 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:09,911 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-04 00:43:10,221 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-04 00:43:10,222 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-04 00:43:10,225 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:10,225 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:10,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:10,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-04 00:43:10,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:10,239 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-04 00:43:10,246 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:10,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:10,384 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:10,418 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:10,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:10,423 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:10,456 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:10,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940f9df0> has no local changes
2024-09-04 00:43:10,461 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:10,469 [ scc.git] DEBUG [detached HEAD f96914a] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:10,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:10,469 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:10,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-04 00:43:11,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-04 00:43:11,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-04 00:43:12,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-04 00:43:12,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-04 00:43:13,284 [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-09-04 00:43:13,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-04 00:43:14,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:43:14,180 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-04 00:43:14,180 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:14,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-04 00:43:14,180 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:14,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:14,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:14,189 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:14,189 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:14,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:14,198 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:14,198 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-04 00:43:14,616 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-04 00:43:14,617 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-04 00:43:14,620 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:14,620 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:14,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:14,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-04 00:43:14,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:14,634 [ 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-09-04 00:43:14,642 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-04 00:43:14,643 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:14,645 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-04 00:43:14,645 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-04 00:43:14,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:14,774 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:14,808 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:14,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:14,813 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:14,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:14,851 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940a0700> has no local changes
2024-09-04 00:43:14,851 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:14,859 [ scc.git] DEBUG [detached HEAD dd1ddb3] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:14,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:14,859 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:15,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-04 00:43:15,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-04 00:43:16,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-04 00:43:16,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-04 00:43:17,144 [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-09-04 00:43:17,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-04 00:43:18,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:43:18,094 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-04 00:43:18,094 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:18,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-04 00:43:18,094 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:18,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:18,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:18,103 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:18,103 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:18,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:18,112 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:18,113 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-04 00:43:18,588 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-04 00:43:18,589 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-04 00:43:18,592 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:18,593 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:18,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:18,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-04 00:43:18,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:18,606 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-04 00:43:18,690 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-04 00:43:18,690 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-04 00:43:18,690 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG Auto-merging setup.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:43:18,691 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-04 00:43:18,691 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:43:18,695 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-04 00:43:18,701 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-04 00:43:18,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:18,834 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-04 00:43:18,839 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-04 00:43:18,843 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-09-04 00:43:18,847 [ scc.config] DEBUG Found github.token
2024-09-04 00:43:18,848 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-04 00:43:18,848 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:18,882 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:18,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:18,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:18,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:18,925 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff494083f10> has no local changes
2024-09-04 00:43:18,926 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:18,933 [ scc.git] DEBUG [detached HEAD 0c887ef] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:18,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:18,933 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:19,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-04 00:43:19,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-04 00:43:20,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-04 00:43:20,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-04 00:43:21,193 [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-09-04 00:43:21,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-04 00:43:22,142 [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-09-04 00:43:22,143 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-04 00:43:22,143 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:22,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-04 00:43:22,143 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:22,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:22,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:22,152 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:22,152 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:22,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:22,161 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:22,161 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-04 00:43:22,533 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-04 00:43:22,533 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-04 00:43:22,536 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:22,536 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:22,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:22,541 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-04 00:43:22,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:22,551 [ 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-09-04 00:43:22,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:43:22,565 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-04 00:43:22,565 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-04 00:43:22,565 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-04 00:43:22,565 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-04 00:43:22,565 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-04 00:43:22,566 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-04 00:43:22,567 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-04 00:43:22,567 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-04 00:43:22,567 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-04 00:43:22,568 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-04 00:43:22,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:22,708 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:22,744 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:22,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:22,748 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:22,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:22,787 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4940039d0> has no local changes
2024-09-04 00:43:22,787 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:22,795 [ scc.git] DEBUG [detached HEAD 5d4e368] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:22,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:22,796 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:23,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-04 00:43:23,135 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:23,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-04 00:43:23,135 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:23,143 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:23,143 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:23,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:23,152 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:23,152 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:23,152 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,156 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:23,190 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:23,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:23,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff494064f40> has no local changes
2024-09-04 00:43:23,234 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:23,240 [ scc.git] DEBUG [detached HEAD 6b15010] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:23,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:23,241 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:23,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-04 00:43:23,541 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:23,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-04 00:43:23,541 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,546 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:23,550 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:23,550 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:23,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:23,559 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:23,559 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:23,559 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,563 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:23,598 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:23,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:23,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:23,636 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:23,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff49405d460> has no local changes
2024-09-04 00:43:23,641 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:23,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:23,649 [ scc.git] DEBUG [detached HEAD c1d74c9] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:23,649 [ scc.git] INFO Overriding base-branch from master to main
2024-09-04 00:43:23,649 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:24,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-04 00:43:24,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-04 00:43:24,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-04 00:43:25,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-04 00:43:25,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-04 00:43:26,331 [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-09-04 00:43:26,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-04 00:43:27,245 [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-09-04 00:43:27,245 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-04 00:43:27,246 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:27,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-04 00:43:27,246 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:27,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:27,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-04 00:43:27,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:27,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-04 00:43:27,259 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-04 00:43:27,263 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:27,264 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-04 00:43:27,655 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-04 00:43:27,655 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-04 00:43:27,658 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:27,658 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:27,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:27,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-04 00:43:27,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:27,671 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-04 00:43:27,681 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-04 00:43:27,681 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-04 00:43:27,681 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:43:27,681 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:43:27,686 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-04 00:43:27,691 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-04 00:43:27,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:27,822 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-04 00:43:27,826 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-04 00:43:27,830 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-04 00:43:27,834 [ scc.config] DEBUG Found github.token
2024-09-04 00:43:27,835 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-04 00:43:27,835 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:27,869 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:27,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:27,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:27,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:27,912 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff494036bb0> has no local changes
2024-09-04 00:43:27,913 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:27,920 [ scc.git] DEBUG [detached HEAD 8447f2e] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:27,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:27,920 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:28,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-04 00:43:28,233 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:28,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-04 00:43:28,233 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,237 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:28,242 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:28,242 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:28,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:28,251 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:28,251 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:28,251 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,255 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:28,289 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:28,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:28,332 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff494033eb0> has no local changes
2024-09-04 00:43:28,332 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:28,339 [ scc.git] DEBUG [detached HEAD 1e24078] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:28,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:28,340 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:28,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-04 00:43:28,640 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:28,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-04 00:43:28,641 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,645 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:28,649 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:28,649 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:28,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:28,658 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:28,658 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:28,658 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,662 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:28,696 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:28,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:28,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:28,734 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:28,740 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff47c7d1640> has no local changes
2024-09-04 00:43:28,740 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:28,747 [ scc.git] DEBUG [detached HEAD d377c39] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:28,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:28,747 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:29,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-04 00:43:29,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-04 00:43:30,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-04 00:43:30,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-04 00:43:31,033 [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-09-04 00:43:31,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-04 00:43:31,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:43:31,912 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-04 00:43:31,912 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:31,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-04 00:43:31,913 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:31,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:31,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:43:31,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:31,921 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:43:31,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:43:31,930 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:31,930 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-04 00:43:32,309 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-04 00:43:32,309 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-04 00:43:32,313 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:32,313 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:32,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:32,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-04 00:43:32,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:32,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-04 00:43:32,380 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-04 00:43:32,380 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-04 00:43:32,380 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:43:32,381 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:43:32,385 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-04 00:43:32,392 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-04 00:43:32,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:32,537 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-04 00:43:32,542 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-04 00:43:32,547 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-04 00:43:32,551 [ scc.config] DEBUG Found github.token
2024-09-04 00:43:32,551 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-04 00:43:32,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:32,585 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:32,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:32,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:32,623 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:32,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff49402ac40> has no local changes
2024-09-04 00:43:32,629 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:32,636 [ scc.git] DEBUG [detached HEAD 53b57da] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:32,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:32,637 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-04 00:43:32,637 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:43:33,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-04 00:43:33,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-04 00:43:34,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-04 00:43:34,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-04 00:43:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-04 00:43:35,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-04 00:43:36,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-04 00:43:36,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-04 00:43:36,981 [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-09-04 00:43:37,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-04 00:43:37,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:43:37,895 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-04 00:43:38,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-04 00:43:38,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-04 00:43:39,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-04 00:43:39,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-04 00:43:39,924 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:43:39,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-04 00:43:39,925 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:39,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:39,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-04 00:43:39,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:43:39,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-04 00:43:39,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-04 00:43:39,943 [ scc.git] DEBUG Already up to date.
2024-09-04 00:43:39,943 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-04 00:43:40,632 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-04 00:43:40,632 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-04 00:43:40,636 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:43:40,636 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:40,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:40,641 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-04 00:43:40,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:40,651 [ 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-09-04 00:43:40,750 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-04 00:43:40,750 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-04 00:43:40,750 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:43:40,750 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:43:40,755 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-04 00:43:40,760 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-04 00:43:40,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:40,893 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-04 00:43:40,898 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-04 00:43:40,903 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#174](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-04 00:43:40,907 [ scc.config] DEBUG Found github.token
2024-09-04 00:43:40,907 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-04 00:43:40,908 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:43:40,943 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:43:40,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:43:40,948 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:40,981 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:40,987 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff47c787910> has no local changes
2024-09-04 00:43:40,987 [ 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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:40,995 [ scc.git] DEBUG [detached HEAD 92570e3] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:40,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:40,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:43:41,062 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-04 00:43:41,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:41,281 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-04 00:43:41,284 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-04 00:43:41,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:41,670 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-04 00:43:41,674 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-04 00:43:42,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:42,050 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-04 00:43:42,054 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-04 00:43:42,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:42,431 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-04 00:43:42,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:42,806 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-04 00:43:42,810 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-04 00:43:43,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:43,198 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-04 00:43:43,202 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-04 00:43:43,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:43,586 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-04 00:43:43,590 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-04 00:43:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:43,968 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-04 00:43:43,972 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-04 00:43:44,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:44,350 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-04 00:43:44,354 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-04 00:43:44,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:44,734 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-04 00:43:44,738 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-04 00:43:45,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:45,115 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-04 00:43:45,118 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-04 00:43:45,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:45,500 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-04 00:43:45,503 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-04 00:43:45,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:45,894 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-04 00:43:46,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:46,274 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-04 00:43:46,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:46,654 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-04 00:43:46,658 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-04 00:43:47,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:47,044 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-04 00:43:47,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:47,434 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-04 00:43:47,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:47,816 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-04 00:43:47,820 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-04 00:43:48,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:48,202 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-04 00:43:48,205 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-04 00:43:48,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:48,581 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-04 00:43:48,585 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-04 00:43:48,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:48,973 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-04 00:43:48,977 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-04 00:43:49,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:43:49,353 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-04 00:43:49,353 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:43:49,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff497f14e50> has local changes
2024-09-04 00:43:49,428 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
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 543 will-moore 'Plate well labels' (exclude comment)
Updating b540416f..5f623996
Previously merged:
- PR 585 will-moore 'Changelog 7.1.0'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
- 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'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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#174 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/174/)'
2024-09-04 00:43:49,441 [ scc.git] DEBUG [detached HEAD d0d98db] merge master -Dorg -Ssuccess-only
2024-09-04 00:43:49,441 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-04 00:43:49,441 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-04 00:43:49,441 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-04 00:43:49,441 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,441 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-04 00:43:49,441 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,441 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-04 00:43:49,441 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,441 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-04 00:43:49,441 [ scc.merge] INFO
2024-09-04 00:43:49,441 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-04 00:43:49,441 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-04 00:43:49,442 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-04 00:43:49,442 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-04 00:43:49,442 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-04 00:43:49,442 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-04 00:43:49,442 [ scc.merge] INFO Updating b540416f..5f623996
2024-09-04 00:43:49,442 [ scc.merge] INFO Previously merged:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 585 will-moore 'Changelog 7.1.0'
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-04 00:43:49,442 [ scc.merge] INFO
2024-09-04 00:43:49,442 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,442 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-04 00:43:49,443 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-04 00:43:49,443 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-04 00:43:49,443 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-04 00:43:49,443 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-04 00:43:49,443 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-04 00:43:49,443 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,443 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-04 00:43:49,443 [ scc.merge] INFO
2024-09-04 00:43:49,443 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-04 00:43:49,444 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-04 00:43:49,444 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-04 00:43:49,444 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-04 00:43:49,444 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-04 00:43:49,444 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-04 00:43:49,444 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,444 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-04 00:43:49,444 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,444 [ scc.merge] INFO
2024-09-04 00:43:49,444 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,445 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Merged PRs:
2024-09-04 00:43:49,445 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-04 00:43:49,445 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,445 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,445 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-04 00:43:49,445 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,445 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-04 00:43:49,445 [ scc.merge] INFO
2024-09-04 00:43:49,445 [ scc.merge] INFO Repository: ome/scripts
2024-09-04 00:43:49,446 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:43:49,446 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-04 00:43:49,446 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-04 00:43:49,446 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-04 00:43:49,446 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-04 00:43:49,446 [ scc.merge] INFO Already up to date.
2024-09-04 00:43:49,446 [ scc.merge] INFO
2024-09-04 00:43:49,446 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:43:49,446 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-04 00:43:49,446 [ scc.merge] INFO
2024-09-04 00:43:49,446 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-04 00:43:49,446 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-04 00:43:49,450 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-04 00:43:49,454 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-04 00:43:49,459 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-04 00:43:49,463 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-04 00:43:49,467 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-04 00:43:49,472 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-04 00:43:49,476 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-04 00:43:49,481 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-04 00:43:49,485 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-04 00:43:49,489 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-04 00:43:49,493 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-04 00:43:49,498 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-04 00:43:49,502 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-04 00:43:49,507 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-04 00:43:49,511 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-04 00:43:49,516 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-04 00:43:49,520 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-04 00:43:49,525 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-04 00:43:49,529 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-04 00:43:49,533 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-04 00:43:49,538 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-04 00:43:49,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-04 00:43:49,542 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:43:49,546 [ 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.4-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 8140053] 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 b540416f
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 030830f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-09-04 00:44:33,291 [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-09-04 00:44:41,942 [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-09-04 00:44:44,275 [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-09-04 00:44:48,734 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-04 00:45:27,689 [ 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}
