Console Output
Skipping 105 KB..
Full Log43:32,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/shape_editor/rect.js
2024-09-02 00:43:32,885 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-09-02 00:43:32,885 [ scc.git] DEBUG Auto-merging src/templates/shapes/shape_toolbar.template.html
2024-09-02 00:43:32,885 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:43:32,885 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:43:32,895 [ scc.git] DEBUG Calling 'git reset --hard d2b406235e13f2e10612dd50ca7f3ec3f13b0dc9'
2024-09-02 00:43:32,908 [ scc.git] DEBUG HEAD is now at d2b40623 merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-09-02 00:43:33,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:43:33,038 [ scc.git] DEBUG Calling 'git merge-base cbdd365756caa80353d6b3ffd66259efbda098ee cde38a507d291b03c4b821a8d4d110985ed17164'
2024-09-02 00:43:33,046 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..cbdd365756caa80353d6b3ffd66259efbda098ee'
2024-09-02 00:43:33,053 [ scc.git] INFO - PR 577 Rdornier 'Fill rois'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/js/shape_editor/rect.js
- PR #555 will-moore 'Points in shape editor'
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
- PR #560 will-moore 'Max projection bytes'
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
--conflicts
2024-09-02 00:43:33,059 [ scc.config] DEBUG Found github.token
2024-09-02 00:43:33,059 [ scc.git] DEBUG Adding comment to issue #577.
2024-09-02 00:43:33,765 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/577/comments HTTP/1.1" 201 2212
2024-09-02 00:43:33,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-02 00:43:33,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:33,790 [ 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-02 00:43:33,875 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-02 00:43:33,876 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:43:33,882 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-02 00:43:33,882 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-02 00:43:33,882 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-02 00:43:33,882 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-02 00:43:33,882 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-02 00:43:33,882 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-02 00:43:34,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:43:34,163 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:43:34,207 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:34,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:34,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:43:34,254 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:43:34,264 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1675708790> has no local changes
2024-09-02 00:43:34,264 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:43:34,275 [ scc.git] DEBUG [detached HEAD e0445b36] merge master -Dorg -Ssuccess-only
2024-09-02 00:43:34,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:43:34,276 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:43:34,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-02 00:43:35,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-02 00:43:35,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-02 00:43:36,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-02 00:43:36,569 [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-02 00:43:37,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-02 00:43:37,494 [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-02 00:43:37,495 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-02 00:43:37,495 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:43:37,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-02 00:43:37,495 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:37,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:37,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:43:37,506 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:43:37,506 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:43:37,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:43:37,516 [ scc.git] DEBUG Already up to date.
2024-09-02 00:43:37,516 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-02 00:43:37,853 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-02 00:43:37,853 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-02 00:43:37,857 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:43:37,857 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:37,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:37,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-02 00:43:37,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:37,875 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-02 00:43:37,891 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-02 00:43:37,892 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:43:37,894 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-02 00:43:37,894 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-02 00:43:38,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:43:38,032 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:43:38,072 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:38,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:38,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:43:38,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:43:38,123 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1677754ee0> has no local changes
2024-09-02 00:43:38,123 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:43:38,131 [ scc.git] DEBUG [detached HEAD 06e4d1f] merge master -Dorg -Ssuccess-only
2024-09-02 00:43:38,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:43:38,132 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:43:38,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-02 00:43:38,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-02 00:43:38,965 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:43:39,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-02 00:43:39,980 [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-02 00:43:40,471 [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-02 00:43:40,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-02 00:43:41,302 [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-02 00:43:41,302 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-02 00:43:41,303 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:43:41,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-02 00:43:41,303 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:41,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:41,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:43:41,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:43:41,313 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:43:41,318 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:43:41,323 [ scc.git] DEBUG Already up to date.
2024-09-02 00:43:41,324 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-02 00:43:41,678 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-02 00:43:41,678 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-02 00:43:41,682 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:43:41,682 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:41,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:41,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-02 00:43:41,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:41,697 [ 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-02 00:43:41,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:43:41,711 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-02 00:43:41,711 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-02 00:43:41,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:43:41,849 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:43:41,892 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:43:41,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:43:41,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:43:41,942 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:43:41,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1675708a00> has no local changes
2024-09-02 00:43:41,951 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:43:41,962 [ scc.git] DEBUG [detached HEAD 2768311] merge master -Dorg -Ssuccess-only
2024-09-02 00:43:41,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:43:41,963 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:43:42,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-02 00:43:42,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-02 00:43:42,887 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:43:43,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-02 00:43:43,841 [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-02 00:43:44,341 [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-02 00:43:44,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-02 00:43:45,285 [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-02 00:43:45,286 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-02 00:43:45,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-02 00:43:46,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-02 00:43:46,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-02 00:43:47,258 [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-02 00:43:47,721 [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-02 00:43:48,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-02 00:43:48,532 [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-02 00:43:48,532 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-02 00:43:48,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-02 00:43:49,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-02 00:43:49,421 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:43:50,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-02 00:43:50,478 [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-02 00:43:51,051 [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-02 00:43:51,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-02 00:43:52,052 [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-02 00:43:52,052 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-02 00:43:52,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-02 00:43:52,503 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:43:53,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-02 00:43:53,624 [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-02 00:43:54,147 [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-02 00:43:54,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-02 00:43:55,093 [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-02 00:43:55,094 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-02 00:43:55,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-02 00:43:55,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-02 00:43:56,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-02 00:43:56,985 [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-02 00:43:57,423 [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-02 00:43:57,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-02 00:43:58,391 [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-02 00:43:58,392 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-02 00:43:58,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-02 00:43:59,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-02 00:43:59,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-02 00:44:00,302 [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-02 00:44:00,835 [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-02 00:44:01,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-02 00:44:01,723 [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-02 00:44:01,724 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-02 00:44:02,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-02 00:44:02,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-02 00:44:03,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-02 00:44:03,523 [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-02 00:44:04,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-02 00:44:04,429 [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-02 00:44:04,429 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-02 00:44:04,430 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:04,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-02 00:44:04,430 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:04,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:04,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:04,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:04,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:04,447 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:04,454 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:04,455 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-02 00:44:04,772 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:04,772 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-02 00:44:04,777 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-02 00:44:05,735 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:05,735 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-02 00:44:05,740 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-02 00:44:06,138 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:06,138 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-02 00:44:06,143 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-02 00:44:06,419 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:06,419 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-02 00:44:06,424 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-02 00:44:06,700 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:06,701 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-02 00:44:06,705 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-02 00:44:07,023 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:07,024 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-02 00:44:07,028 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-02 00:44:07,306 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-02 00:44:07,306 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-02 00:44:07,310 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:07,310 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:07,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:07,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-02 00:44:07,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:07,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-02 00:44:07,408 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-02 00:44:07,410 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:07,413 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-02 00:44:07,414 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-02 00:44:07,414 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-02 00:44:07,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:07,558 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-02 00:44:07,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:07,570 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-02 00:44:07,673 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-02 00:44:07,674 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-02 00:44:07,674 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-02 00:44:07,674 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-02 00:44:07,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:07,678 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-02 00:44:07,678 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-02 00:44:07,679 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-02 00:44:07,679 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-02 00:44:07,679 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-02 00:44:07,679 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-02 00:44:07,679 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-02 00:44:07,679 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-02 00:44:07,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:07,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-02 00:44:07,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:07,966 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-02 00:44:08,028 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-02 00:44:08,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:08,032 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-02 00:44:08,032 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-02 00:44:08,032 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-02 00:44:08,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:08,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-02 00:44:08,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:08,381 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-02 00:44:08,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:08,452 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-02 00:44:08,452 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-02 00:44:08,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:08,761 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-02 00:44:08,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:08,784 [ 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-02 00:44:08,843 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-02 00:44:08,843 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:09,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:09,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-02 00:44:09,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:09,157 [ 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-02 00:44:09,307 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-02 00:44:09,307 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-02 00:44:09,307 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-02 00:44:09,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-02 00:44:09,313 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-02 00:44:09,313 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-02 00:44:09,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:09,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-02 00:44:09,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:09,547 [ 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-02 00:44:09,582 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-02 00:44:09,582 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:09,592 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-02 00:44:09,592 [ scc.git] DEBUG package.json | 2 +-
2024-09-02 00:44:09,592 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-02 00:44:09,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:09,920 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:09,958 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:09,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:09,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:10,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:10,013 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1675724be0> has no local changes
2024-09-02 00:44:10,013 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:10,022 [ scc.git] DEBUG [detached HEAD a79c4fe] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:10,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:10,023 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:10,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-02 00:44:10,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-02 00:44:11,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-02 00:44:11,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-02 00:44:12,322 [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-02 00:44:12,792 [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-02 00:44:13,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-02 00:44:13,686 [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-02 00:44:13,687 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-02 00:44:13,687 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:13,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-02 00:44:13,687 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:13,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:13,693 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:13,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:13,699 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:13,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:13,709 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:13,710 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-02 00:44:14,030 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-02 00:44:14,031 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-02 00:44:14,034 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:14,034 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:14,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:14,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-02 00:44:14,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:14,053 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-02 00:44:14,064 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:14,067 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-02 00:44:14,067 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-02 00:44:14,067 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-02 00:44:14,067 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-02 00:44:14,067 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-02 00:44:14,067 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-02 00:44:14,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:14,201 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:14,241 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:14,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:14,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:14,284 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:14,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16746ca7f0> has no local changes
2024-09-02 00:44:14,290 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:14,298 [ scc.git] DEBUG [detached HEAD f5aab6f] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:14,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:14,299 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:14,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-02 00:44:15,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-02 00:44:15,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-02 00:44:16,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-02 00:44:16,530 [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-02 00:44:17,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-02 00:44:17,448 [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-02 00:44:17,449 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-02 00:44:17,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-02 00:44:18,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-02 00:44:18,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-02 00:44:19,317 [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-02 00:44:19,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-02 00:44:20,231 [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-02 00:44:20,232 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-02 00:44:20,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-02 00:44:21,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-02 00:44:21,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-02 00:44:22,085 [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-02 00:44:22,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-02 00:44:22,903 [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-02 00:44:22,904 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-02 00:44:22,904 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:22,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-02 00:44:22,904 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:22,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:22,910 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:22,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:22,915 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:22,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:22,924 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:22,924 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-02 00:44:23,233 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-02 00:44:23,233 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-02 00:44:23,237 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-02 00:44:23,681 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-02 00:44:23,681 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-02 00:44:23,685 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-02 00:44:23,977 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-02 00:44:23,978 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-02 00:44:23,982 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:23,982 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:23,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:23,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-02 00:44:23,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:24,000 [ 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-02 00:44:24,055 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-02 00:44:24,055 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-02 00:44:24,055 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-02 00:44:24,055 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-02 00:44:24,055 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:44:24,056 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:44:24,062 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-02 00:44:24,068 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-02 00:44:24,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:24,201 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-02 00:44:24,208 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-02 00:44:24,214 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-02 00:44:24,218 [ scc.config] DEBUG Found github.token
2024-09-02 00:44:24,218 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-02 00:44:24,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-02 00:44:24,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:24,229 [ 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-02 00:44:24,264 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-02 00:44:24,264 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-02 00:44:24,264 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-02 00:44:24,264 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:44:24,265 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:44:24,271 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-02 00:44:24,278 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-02 00:44:24,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:24,595 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-02 00:44:24,603 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-02 00:44:24,610 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/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-02 00:44:24,617 [ scc.config] DEBUG Found github.token
2024-09-02 00:44:24,617 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-02 00:44:24,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-02 00:44:24,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:24,629 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-02 00:44:24,645 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:24,648 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-02 00:44:24,649 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-02 00:44:24,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:24,983 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:25,023 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:25,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:25,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:25,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:25,077 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16746ca580> has no local changes
2024-09-02 00:44:25,078 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:25,086 [ scc.git] DEBUG [detached HEAD 2ca8d47] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:25,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:25,087 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:25,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-02 00:44:25,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-02 00:44:26,001 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:44:26,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-02 00:44:27,056 [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-02 00:44:27,574 [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-02 00:44:28,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-02 00:44:28,553 [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-02 00:44:28,554 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-02 00:44:29,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-02 00:44:29,047 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:44:29,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-02 00:44:30,114 [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-02 00:44:30,555 [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-02 00:44:31,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-02 00:44:31,482 [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-02 00:44:31,482 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-02 00:44:31,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-02 00:44:31,920 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:44:32,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-02 00:44:32,951 [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-02 00:44:33,423 [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-02 00:44:33,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-02 00:44:34,246 [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-02 00:44:34,247 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-02 00:44:34,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-02 00:44:35,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-02 00:44:35,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-02 00:44:36,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-02 00:44:36,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-02 00:44:37,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-02 00:44:37,070 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:37,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-02 00:44:37,071 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:37,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:37,078 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:37,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:37,084 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:37,090 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:37,096 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:37,097 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-02 00:44:37,445 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-02 00:44:37,445 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-02 00:44:37,449 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-02 00:44:37,734 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-02 00:44:37,734 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-02 00:44:37,739 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-02 00:44:38,023 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-02 00:44:38,023 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-02 00:44:38,027 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:38,028 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:38,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:38,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-02 00:44:38,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:38,046 [ 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-02 00:44:38,058 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:38,062 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-02 00:44:38,062 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-02 00:44:38,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:38,212 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-02 00:44:38,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:38,225 [ 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-02 00:44:38,265 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-02 00:44:38,266 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:38,269 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-02 00:44:38,269 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-02 00:44:38,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:38,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-02 00:44:38,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:38,609 [ 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-02 00:44:38,621 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-02 00:44:38,621 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:38,624 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-02 00:44:38,624 [ scc.git] DEBUG package.json | 2 +-
2024-09-02 00:44:38,624 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-02 00:44:38,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:38,987 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:39,032 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:39,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:39,039 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:39,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:39,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16756ffc70> has no local changes
2024-09-02 00:44:39,089 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:39,099 [ scc.git] DEBUG [detached HEAD 4569a99] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:39,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:39,100 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:39,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-02 00:44:39,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-02 00:44:40,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-02 00:44:40,813 [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-02 00:44:41,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-02 00:44:41,691 [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-02 00:44:41,692 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-02 00:44:41,692 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:41,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-02 00:44:41,692 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:41,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:41,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:41,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:41,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:41,709 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:41,717 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:41,717 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-02 00:44:42,038 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-02 00:44:42,038 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-02 00:44:42,042 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:42,042 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:42,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:42,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-02 00:44:42,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:42,060 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-02 00:44:42,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:42,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:42,203 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:42,245 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:42,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:42,252 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:42,295 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:42,302 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1675716e20> has no local changes
2024-09-02 00:44:42,302 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:42,311 [ scc.git] DEBUG [detached HEAD 57c2765] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:42,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:42,311 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:42,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-02 00:44:43,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-02 00:44:43,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-02 00:44:44,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-02 00:44:44,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-02 00:44:44,997 [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-02 00:44:45,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-02 00:44:45,813 [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-02 00:44:45,814 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-02 00:44:45,814 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:45,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-02 00:44:45,814 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:45,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:45,824 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:45,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:45,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:45,836 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:45,842 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:45,842 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-02 00:44:46,168 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-02 00:44:46,168 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-02 00:44:46,173 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:46,173 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:46,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:46,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-02 00:44:46,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:46,193 [ 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-02 00:44:46,211 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-02 00:44:46,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:46,215 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-02 00:44:46,215 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-02 00:44:46,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:46,427 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:46,465 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:46,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:46,471 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:46,509 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:46,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f167571fac0> has no local changes
2024-09-02 00:44:46,516 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:46,524 [ scc.git] DEBUG [detached HEAD de51020] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:46,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:46,524 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-02 00:44:47,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-02 00:44:47,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-02 00:44:48,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-02 00:44:48,896 [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-02 00:44:49,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-02 00:44:49,831 [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-02 00:44:49,832 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-02 00:44:49,832 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:49,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-02 00:44:49,832 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:49,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:49,838 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:49,844 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:49,844 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:49,850 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:49,856 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:49,856 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-02 00:44:50,204 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-02 00:44:50,205 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-02 00:44:50,209 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:50,210 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:50,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:50,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-02 00:44:50,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:50,225 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-02 00:44:50,263 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG Auto-merging setup.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-02 00:44:50,263 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:44:50,264 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:44:50,271 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-02 00:44:50,277 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-02 00:44:50,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:50,412 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-02 00:44:50,420 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-02 00:44:50,426 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-09-02 00:44:50,430 [ scc.config] DEBUG Found github.token
2024-09-02 00:44:50,430 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-02 00:44:50,430 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:50,471 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:50,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:50,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:50,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:50,523 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16746924c0> has no local changes
2024-09-02 00:44:50,523 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:50,531 [ scc.git] DEBUG [detached HEAD eb20908] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:50,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:50,531 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:50,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-02 00:44:51,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-02 00:44:51,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-02 00:44:52,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-02 00:44:52,722 [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-02 00:44:53,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-02 00:44:53,627 [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-02 00:44:53,628 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-02 00:44:53,628 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:53,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-02 00:44:53,628 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:53,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:53,634 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:53,638 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:53,638 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:53,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:53,648 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:53,649 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-02 00:44:53,998 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-02 00:44:53,999 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-02 00:44:54,004 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:54,004 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:54,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-02 00:44:54,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,020 [ 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-02 00:44:54,054 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:44:54,057 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-02 00:44:54,057 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-02 00:44:54,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-02 00:44:54,060 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-02 00:44:54,060 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-02 00:44:54,060 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-02 00:44:54,060 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-02 00:44:54,061 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-02 00:44:54,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:54,201 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:54,240 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:54,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:54,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:54,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16746d9e20> has no local changes
2024-09-02 00:44:54,289 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:54,298 [ scc.git] DEBUG [detached HEAD fdaf496] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:54,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:54,298 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:54,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-02 00:44:54,620 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:54,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-02 00:44:54,621 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:54,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,626 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:54,631 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:54,631 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:54,636 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:54,641 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:54,641 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:54,641 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:54,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,646 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:54,684 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:54,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:54,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:54,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:54,734 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f167469af10> has no local changes
2024-09-02 00:44:54,734 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:54,742 [ scc.git] DEBUG [detached HEAD 79b092a] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:54,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:54,742 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:55,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-02 00:44:55,020 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:55,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-02 00:44:55,020 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:55,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:55,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:55,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:55,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:55,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:55,040 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:55,040 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:55,040 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:55,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:55,045 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:55,084 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:55,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:55,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:55,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:55,140 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1674639940> has no local changes
2024-09-02 00:44:55,140 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:55,149 [ scc.git] DEBUG [detached HEAD d4a321c] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:55,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:55,150 [ scc.git] INFO Overriding base-branch from master to main
2024-09-02 00:44:55,150 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:55,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-02 00:44:55,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-02 00:44:56,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-02 00:44:56,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-02 00:44:57,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-02 00:44:57,859 [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-02 00:44:58,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-02 00:44:58,742 [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-02 00:44:58,743 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-02 00:44:58,743 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:58,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-02 00:44:58,744 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:58,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:58,750 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-02 00:44:58,756 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:58,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-02 00:44:58,762 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-02 00:44:58,768 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:58,768 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-02 00:44:59,110 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-02 00:44:59,111 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-02 00:44:59,115 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:59,115 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:59,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,122 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-02 00:44:59,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-02 00:44:59,166 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-02 00:44:59,166 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-02 00:44:59,166 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:44:59,167 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:44:59,172 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-02 00:44:59,178 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-02 00:44:59,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:44:59,320 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-02 00:44:59,326 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-02 00:44:59,331 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-02 00:44:59,335 [ scc.config] DEBUG Found github.token
2024-09-02 00:44:59,336 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-02 00:44:59,336 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:59,373 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:59,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:59,416 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:59,422 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f167466b670> has no local changes
2024-09-02 00:44:59,422 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:59,430 [ scc.git] DEBUG [detached HEAD 32c384c] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:59,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:59,431 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:44:59,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-02 00:44:59,729 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:44:59,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-02 00:44:59,730 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:59,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:44:59,743 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:44:59,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:44:59,760 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:44:59,767 [ scc.git] DEBUG Already up to date.
2024-09-02 00:44:59,767 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:44:59,767 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:59,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,772 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:44:59,809 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:44:59,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:44:59,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:44:59,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:44:59,858 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f167466ae80> has no local changes
2024-09-02 00:44:59,858 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:44:59,865 [ scc.git] DEBUG [detached HEAD 4195ce3] merge master -Dorg -Ssuccess-only
2024-09-02 00:44:59,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:44:59,865 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:45:00,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-02 00:45:00,135 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:45:00,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-02 00:45:00,136 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:00,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:00,141 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:45:00,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:45:00,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:45:00,151 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:45:00,156 [ scc.git] DEBUG Already up to date.
2024-09-02 00:45:00,156 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:45:00,156 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:00,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:00,162 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:45:00,200 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:00,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:00,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:45:00,242 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:45:00,249 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1674611640> has no local changes
2024-09-02 00:45:00,249 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:45:00,256 [ scc.git] DEBUG [detached HEAD e2cf5b0] merge master -Dorg -Ssuccess-only
2024-09-02 00:45:00,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:00,257 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:45:00,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-02 00:45:01,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-02 00:45:01,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-02 00:45:02,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-02 00:45:02,454 [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-02 00:45:02,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-02 00:45:03,361 [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-02 00:45:03,362 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-02 00:45:03,362 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:45:03,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-02 00:45:03,362 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:03,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:03,371 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:45:03,377 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:45:03,377 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:45:03,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:45:03,391 [ scc.git] DEBUG Already up to date.
2024-09-02 00:45:03,391 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-02 00:45:03,753 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-02 00:45:03,753 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-02 00:45:03,759 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:45:03,759 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:03,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:03,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-02 00:45:03,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:03,778 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-02 00:45:03,862 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-02 00:45:03,863 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-02 00:45:03,863 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:45:03,863 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:45:03,871 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-02 00:45:03,881 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-02 00:45:04,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:04,013 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-02 00:45:04,020 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-02 00:45:04,025 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-02 00:45:04,030 [ scc.config] DEBUG Found github.token
2024-09-02 00:45:04,030 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-02 00:45:04,030 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:45:04,081 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:04,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:04,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:45:04,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:45:04,137 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1674622d90> has no local changes
2024-09-02 00:45:04,138 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:45:04,147 [ scc.git] DEBUG [detached HEAD 1b177e8] merge master -Dorg -Ssuccess-only
2024-09-02 00:45:04,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:04,148 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-02 00:45:04,148 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:45:04,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-02 00:45:05,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-02 00:45:05,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-02 00:45:06,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-02 00:45:06,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-02 00:45:06,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-02 00:45:07,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-02 00:45:07,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-02 00:45:08,245 [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-02 00:45:08,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-02 00:45:09,081 [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-02 00:45:09,082 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-02 00:45:09,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-02 00:45:09,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-02 00:45:10,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-02 00:45:11,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-02 00:45:11,016 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:45:11,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-02 00:45:11,016 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:11,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:11,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-02 00:45:11,027 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:45:11,027 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-02 00:45:11,032 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-02 00:45:11,037 [ scc.git] DEBUG Already up to date.
2024-09-02 00:45:11,038 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-02 00:45:11,540 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-02 00:45:11,540 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-02 00:45:11,545 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:45:11,546 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:11,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:11,552 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-02 00:45:11,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:11,564 [ 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-02 00:45:11,591 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-02 00:45:11,592 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-02 00:45:11,592 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:45:11,592 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:45:11,600 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-02 00:45:11,609 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-02 00:45:11,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:11,754 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-02 00:45:11,767 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-02 00:45:11,777 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#172](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-02 00:45:11,785 [ scc.config] DEBUG Found github.token
2024-09-02 00:45:11,785 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-02 00:45:11,785 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:45:11,840 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:45:11,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:45:11,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:45:11,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:45:11,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1674666e20> has no local changes
2024-09-02 00:45:11,936 [ 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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:45:11,955 [ scc.git] DEBUG [detached HEAD 9ff23c5] merge master -Dorg -Ssuccess-only
2024-09-02 00:45:11,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:11,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:45:12,080 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-02 00:45:12,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:12,255 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-02 00:45:12,265 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-02 00:45:12,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:12,650 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-02 00:45:12,660 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-02 00:45:13,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:13,061 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-02 00:45:13,069 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-02 00:45:13,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:13,484 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-02 00:45:13,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:13,867 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-02 00:45:13,872 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-02 00:45:14,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:14,272 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-02 00:45:14,283 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-02 00:45:14,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:14,648 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-02 00:45:14,656 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-02 00:45:15,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:15,139 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-02 00:45:15,146 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-02 00:45:15,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:15,539 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-02 00:45:15,548 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-02 00:45:15,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:15,955 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-02 00:45:15,961 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-02 00:45:16,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:16,360 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-02 00:45:16,382 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-02 00:45:16,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:16,745 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-02 00:45:16,751 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-02 00:45:17,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:17,152 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-02 00:45:17,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:17,534 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-02 00:45:17,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:17,909 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-02 00:45:17,917 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-02 00:45:18,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:18,311 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-02 00:45:18,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:18,678 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-02 00:45:19,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:19,050 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-02 00:45:19,069 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-02 00:45:19,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:19,449 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-02 00:45:19,459 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-02 00:45:19,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:19,832 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-02 00:45:19,841 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-02 00:45:20,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:20,225 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-02 00:45:20,233 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-02 00:45:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:45:20,627 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-02 00:45:20,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:45:20,741 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1678877760> has local changes
2024-09-02 00:45:20,742 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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#172 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/172/)'
2024-09-02 00:45:20,758 [ scc.git] DEBUG [detached HEAD c405b92] merge master -Dorg -Ssuccess-only
2024-09-02 00:45:20,758 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-02 00:45:20,759 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-02 00:45:20,759 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,759 [ scc.merge] INFO
2024-09-02 00:45:20,759 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,759 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-09-02 00:45:20,759 [ scc.merge] INFO
2024-09-02 00:45:20,759 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-02 00:45:20,759 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,759 [ scc.merge] INFO
2024-09-02 00:45:20,759 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,759 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-02 00:45:20,760 [ scc.merge] INFO
2024-09-02 00:45:20,760 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-02 00:45:20,760 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-02 00:45:20,760 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,760 [ scc.merge] INFO
2024-09-02 00:45:20,760 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-02 00:45:20,760 [ scc.merge] INFO
2024-09-02 00:45:20,760 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-02 00:45:20,760 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-02 00:45:20,760 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,760 [ scc.merge] INFO
2024-09-02 00:45:20,760 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,760 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-02 00:45:20,760 [ scc.merge] INFO
2024-09-02 00:45:20,761 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-02 00:45:20,761 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-02 00:45:20,761 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,761 [ scc.merge] INFO
2024-09-02 00:45:20,761 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-02 00:45:20,761 [ scc.merge] INFO
2024-09-02 00:45:20,761 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-02 00:45:20,761 [ scc.merge] INFO
2024-09-02 00:45:20,761 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-02 00:45:20,761 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image' (user: Rdornier)
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (status: failure)
2024-09-02 00:45:20,761 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-02 00:45:20,761 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,761 [ scc.merge] INFO
2024-09-02 00:45:20,761 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,762 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,762 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-02 00:45:20,762 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,762 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,762 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-02 00:45:20,762 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,762 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,762 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-02 00:45:20,762 [ scc.merge] INFO
2024-09-02 00:45:20,763 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-02 00:45:20,763 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-02 00:45:20,763 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,763 [ scc.merge] INFO
2024-09-02 00:45:20,763 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-02 00:45:20,763 [ scc.merge] INFO
2024-09-02 00:45:20,763 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-02 00:45:20,763 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,763 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-02 00:45:20,763 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,764 [ scc.merge] INFO
2024-09-02 00:45:20,764 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-02 00:45:20,764 [ scc.merge] INFO
2024-09-02 00:45:20,764 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-02 00:45:20,764 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,764 [ scc.merge] INFO
2024-09-02 00:45:20,764 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-02 00:45:20,764 [ scc.merge] INFO
2024-09-02 00:45:20,764 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-02 00:45:20,764 [ scc.merge] INFO
2024-09-02 00:45:20,764 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-02 00:45:20,764 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-02 00:45:20,764 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-02 00:45:20,764 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-02 00:45:20,765 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-02 00:45:20,765 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-02 00:45:20,765 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,765 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-02 00:45:20,765 [ scc.merge] INFO
2024-09-02 00:45:20,765 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-02 00:45:20,765 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,766 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-02 00:45:20,766 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Merged PRs:
2024-09-02 00:45:20,766 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-02 00:45:20,766 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-02 00:45:20,766 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-02 00:45:20,766 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,766 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-02 00:45:20,766 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,766 [ scc.merge] INFO
2024-09-02 00:45:20,766 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-02 00:45:20,767 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-02 00:45:20,767 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-02 00:45:20,767 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-02 00:45:20,767 [ scc.merge] INFO
2024-09-02 00:45:20,767 [ scc.merge] INFO Repository: ome/scripts
2024-09-02 00:45:20,767 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-02 00:45:20,767 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-02 00:45:20,767 [ scc.merge] INFO Already up to date.
2024-09-02 00:45:20,768 [ scc.merge] INFO
2024-09-02 00:45:20,768 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:45:20,768 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-02 00:45:20,768 [ scc.merge] INFO
2024-09-02 00:45:20,768 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-02 00:45:20,768 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-02 00:45:20,776 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-02 00:45:20,781 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-02 00:45:20,786 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-02 00:45:20,791 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-02 00:45:20,796 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-02 00:45:20,801 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-02 00:45:20,806 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-02 00:45:20,816 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-02 00:45:20,824 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-02 00:45:20,832 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-02 00:45:20,840 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-02 00:45:20,847 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-02 00:45:20,856 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-02 00:45:20,863 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-02 00:45:20,872 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-02 00:45:20,881 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-02 00:45:20,889 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-02 00:45:20,898 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-02 00:45:20,907 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-02 00:45:20,922 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-02 00:45:20,932 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-02 00:45:20,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-02 00:45:20,940 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:45:20,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 6cbded5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from cbdd3657
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD e06bcc6] 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-02 00:46:08,604 [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-02 00:46:17,325 [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-02 00:46:19,699 [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-02 00:46:24,318 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-02 00:47:02,934 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/58f98332/images/svgs/logo.svg){kind=logo}
