Console Output
Skipping 102 KB..
Full LogBUG Auto-merging src/css/figure.css
2024-09-11 10:03:04,433 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-11 10:03:04,433 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:04,441 [ scc.git] DEBUG .gitignore | 2 +
2024-09-11 10:03:04,441 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 231 ++++++++++++++-------
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/css/figure.css | 1 +
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/js/models/panel_model.js | 31 +++
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/js/views/panel_view.js | 53 ++++-
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/js/views/right_panel_view.js | 56 ++++-
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/js/views/roi_modal_view.js | 1 -
2024-09-11 10:03:04,441 [ scc.git] DEBUG src/templates/rois_form.template.html | 68 +++++-
2024-09-11 10:03:04,441 [ scc.git] DEBUG 8 files changed, 363 insertions(+), 80 deletions(-)
2024-09-11 10:03:04,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:04,679 [ scc.git] DEBUG Resolving previous conflict on Pull Request #578.
2024-09-11 10:03:05,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:05,943 [urllib3.conn] DEBUG https://api.github.com:443 "PATCH /repos/ome/omero-figure/issues/comments/2336899034 HTTP/1.1" 200 None
2024-09-11 10:03:05,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-11 10:03:05,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:05,965 [ 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-11 10:03:06,032 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-11 10:03:06,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:06,037 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-11 10:03:06,038 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-11 10:03:06,038 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-11 10:03:06,038 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-11 10:03:06,038 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-11 10:03:06,038 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-11 10:03:06,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:06,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15d28a393f071234c3a7355829cbc9a4521246f8'
2024-09-11 10:03:06,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:06,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 584 (Link url to image) 15d28a393f071234c3a7355829cbc9a4521246f8'
2024-09-11 10:03:06,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:06,406 [ scc.git] DEBUG omero_figure/views.py | 130 ++++++++++++++++++++++++++++++++++++------
2024-09-11 10:03:06,406 [ scc.git] DEBUG src/js/models/figure_model.js | 10 ++--
2024-09-11 10:03:06,406 [ scc.git] DEBUG src/js/views/figure_view.js | 10 ++--
2024-09-11 10:03:06,406 [ scc.git] DEBUG 3 files changed, 124 insertions(+), 26 deletions(-)
2024-09-11 10:03:06,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:06,773 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:03:06,820 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:06,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:06,827 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:03:06,875 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:03:06,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d0584f0> has no local changes
2024-09-11 10:03:06,886 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:03:06,899 [ scc.git] DEBUG [detached HEAD ddc5b07a] merge master -Dorg -Ssuccess-only
2024-09-11 10:03:06,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:03:06,900 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:03:07,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-11 10:03:07,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-11 10:03:08,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-11 10:03:11,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-11 10:03:11,910 [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-11 10:03:12,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-11 10:03:12,750 [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-11 10:03:12,751 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-11 10:03:12,751 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:03:12,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-11 10:03:12,751 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:12,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:12,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:03:12,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:03:12,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:03:12,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:03:12,777 [ scc.git] DEBUG Already up to date.
2024-09-11 10:03:12,777 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-11 10:03:13,122 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-11 10:03:13,122 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-11 10:03:13,129 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:03:13,129 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:13,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:13,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-11 10:03:13,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:13,150 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-11 10:03:13,160 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-11 10:03:13,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:13,163 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-11 10:03:13,164 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-11 10:03:13,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:13,307 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:03:13,349 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:13,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:13,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:03:13,398 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:03:13,406 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562f0a3ee0> has no local changes
2024-09-11 10:03:13,406 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:03:13,415 [ scc.git] DEBUG [detached HEAD 39e2b51] merge master -Dorg -Ssuccess-only
2024-09-11 10:03:13,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:03:13,416 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:03:13,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-11 10:03:14,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-11 10:03:14,250 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:03:14,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-11 10:03:15,404 [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-11 10:03:15,886 [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-11 10:03:16,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-11 10:03:16,718 [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-11 10:03:16,718 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-11 10:03:16,719 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:03:16,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-11 10:03:16,719 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:16,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:16,725 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:03:16,731 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:03:16,731 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:03:16,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:03:16,742 [ scc.git] DEBUG Already up to date.
2024-09-11 10:03:16,742 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-11 10:03:17,050 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-11 10:03:17,050 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-11 10:03:17,055 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:03:17,055 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:17,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:17,062 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-11 10:03:17,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:17,073 [ 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-11 10:03:17,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:17,090 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-11 10:03:17,090 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-11 10:03:17,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:17,228 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:03:17,274 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:17,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:17,281 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:03:17,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:03:17,351 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d0583d0> has no local changes
2024-09-11 10:03:17,352 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:03:17,362 [ scc.git] DEBUG [detached HEAD 1e0df74] merge master -Dorg -Ssuccess-only
2024-09-11 10:03:17,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:03:17,362 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:03:17,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-11 10:03:18,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-11 10:03:18,276 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:03:18,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-11 10:03:19,292 [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-11 10:03:19,878 [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-11 10:03:20,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-11 10:03:20,875 [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-11 10:03:20,876 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-11 10:03:21,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-11 10:03:21,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-11 10:03:22,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-11 10:03:22,918 [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-11 10:03:23,361 [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-11 10:03:23,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-11 10:03:24,171 [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-11 10:03:24,172 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-11 10:03:24,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-11 10:03:25,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-11 10:03:25,080 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:03:25,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-11 10:03:26,193 [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-11 10:03:26,736 [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-11 10:03:27,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-11 10:03:27,730 [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-11 10:03:27,730 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-11 10:03:28,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-11 10:03:28,189 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:03:28,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-11 10:03:29,331 [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-11 10:03:29,880 [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-11 10:03:30,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-11 10:03:30,701 [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-11 10:03:30,702 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-11 10:03:31,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-11 10:03:31,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-11 10:03:32,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-11 10:03:32,665 [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-11 10:03:33,174 [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-11 10:03:33,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-11 10:03:34,086 [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-11 10:03:34,087 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-11 10:03:34,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-11 10:03:35,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-11 10:03:35,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-11 10:03:36,034 [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-11 10:03:36,542 [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-11 10:03:37,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-11 10:03:37,467 [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-11 10:03:37,468 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-11 10:03:37,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-11 10:03:38,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-11 10:03:38,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-11 10:03:39,326 [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-11 10:03:39,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-11 10:03:40,183 [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-11 10:03:40,184 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-11 10:03:40,184 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:03:40,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-11 10:03:40,184 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:40,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:40,191 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:03:40,197 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:03:40,197 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:03:40,250 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:03:40,257 [ scc.git] DEBUG Already up to date.
2024-09-11 10:03:40,257 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-11 10:03:41,053 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:41,053 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-11 10:03:41,059 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-11 10:03:42,311 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:42,311 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-11 10:03:42,317 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-11 10:03:42,715 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:42,715 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-11 10:03:42,721 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-11 10:03:43,007 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:43,007 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-11 10:03:43,014 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-11 10:03:43,294 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:43,295 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-11 10:03:43,301 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-11 10:03:43,843 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:43,843 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-11 10:03:43,848 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-11 10:03:44,141 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-11 10:03:44,141 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-11 10:03:44,146 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:03:44,147 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:44,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:44,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-11 10:03:44,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:44,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-11 10:03:44,300 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-11 10:03:44,302 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:44,308 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-11 10:03:44,308 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-11 10:03:44,308 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-11 10:03:44,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:44,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-11 10:03:44,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:44,464 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-11 10:03:44,712 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-11 10:03:44,713 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-11 10:03:44,713 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-11 10:03:44,713 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-11 10:03:44,713 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:44,719 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-11 10:03:44,719 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-11 10:03:44,719 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-11 10:03:44,719 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-11 10:03:44,719 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-11 10:03:44,719 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-11 10:03:44,719 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-11 10:03:44,719 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-11 10:03:44,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:44,858 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-11 10:03:44,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:44,873 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-11 10:03:44,920 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-11 10:03:44,920 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:44,924 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-11 10:03:44,924 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-11 10:03:44,924 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-11 10:03:45,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:45,284 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-11 10:03:45,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:45,354 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-11 10:03:45,439 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:45,450 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-11 10:03:45,450 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-11 10:03:45,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:45,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-11 10:03:45,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:45,695 [ 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-11 10:03:45,760 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-11 10:03:45,762 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:46,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:46,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-11 10:03:46,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:46,088 [ 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-11 10:03:46,201 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-11 10:03:46,201 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-11 10:03:46,201 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-11 10:03:46,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:46,206 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-11 10:03:46,206 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-11 10:03:46,207 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-11 10:03:46,207 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-11 10:03:46,207 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-11 10:03:46,207 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-11 10:03:46,207 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-11 10:03:46,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:46,457 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-11 10:03:46,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:46,521 [ 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-11 10:03:46,620 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-11 10:03:46,621 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:46,631 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-11 10:03:46,631 [ scc.git] DEBUG package.json | 2 +-
2024-09-11 10:03:46,631 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-11 10:03:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:46,925 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:03:46,973 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:46,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:46,979 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:03:47,023 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:03:47,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d073be0> has no local changes
2024-09-11 10:03:47,035 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:03:47,046 [ scc.git] DEBUG [detached HEAD 00dd81c] merge master -Dorg -Ssuccess-only
2024-09-11 10:03:47,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:03:47,047 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:03:47,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-11 10:03:47,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-11 10:03:48,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-11 10:03:48,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-11 10:03:49,418 [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-11 10:03:49,855 [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-11 10:03:50,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-11 10:03:50,732 [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-11 10:03:50,733 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-11 10:03:50,733 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:03:50,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-11 10:03:50,733 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:50,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:50,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:03:50,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:03:50,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:03:50,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:03:50,763 [ scc.git] DEBUG Already up to date.
2024-09-11 10:03:50,764 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-11 10:03:51,123 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-11 10:03:51,123 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-11 10:03:51,127 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:03:51,128 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:51,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:51,134 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-11 10:03:51,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:51,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-11 10:03:51,159 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:03:51,162 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-11 10:03:51,162 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-11 10:03:51,162 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-11 10:03:51,162 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-11 10:03:51,162 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-11 10:03:51,164 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-11 10:03:51,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:03:51,362 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:03:51,405 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:03:51,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:03:51,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:03:51,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:03:51,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562c01a7f0> has no local changes
2024-09-11 10:03:51,469 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:03:51,481 [ scc.git] DEBUG [detached HEAD a304e06] merge master -Dorg -Ssuccess-only
2024-09-11 10:03:51,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:03:51,481 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:03:51,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-11 10:03:52,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-11 10:03:52,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-11 10:03:53,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-11 10:03:53,843 [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-11 10:03:54,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-11 10:03:54,741 [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-11 10:03:54,742 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-11 10:03:55,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-11 10:03:55,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-11 10:03:56,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-11 10:03:56,714 [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-11 10:03:57,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-11 10:03:57,710 [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-11 10:03:57,710 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-11 10:03:58,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-11 10:03:58,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-11 10:03:59,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-11 10:03:59,642 [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-11 10:04:00,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-11 10:04:00,467 [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-11 10:04:00,468 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-11 10:04:00,468 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:00,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-11 10:04:00,468 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:00,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:00,475 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:00,481 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:00,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:00,487 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:00,493 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:00,493 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-11 10:04:00,942 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-11 10:04:00,942 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-11 10:04:00,948 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-11 10:04:01,494 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-11 10:04:01,494 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-11 10:04:01,500 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-11 10:04:01,786 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-11 10:04:01,787 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-11 10:04:01,793 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:01,793 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:01,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:01,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-11 10:04:01,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:01,812 [ 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-11 10:04:01,935 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-11 10:04:01,935 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-11 10:04:01,935 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-11 10:04:01,935 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-11 10:04:01,936 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:01,936 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:01,943 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-11 10:04:01,951 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-11 10:04:02,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:02,087 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-11 10:04:02,095 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-11 10:04:02,102 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-09-11 10:04:02,107 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:02,107 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-11 10:04:02,108 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-11 10:04:02,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:02,135 [ 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-11 10:04:02,155 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-11 10:04:02,156 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-11 10:04:02,156 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-11 10:04:02,156 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:02,156 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:02,164 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-11 10:04:02,174 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-11 10:04:02,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:02,481 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-11 10:04:02,491 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-11 10:04:02,498 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/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-11 10:04:02,505 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:02,506 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-11 10:04:02,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-11 10:04:02,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:02,520 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-11 10:04:02,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:02,536 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-11 10:04:02,536 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-11 10:04:02,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:02,872 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:02,932 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:02,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:02,939 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:02,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:02,992 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562c01a580> has no local changes
2024-09-11 10:04:02,992 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:03,003 [ scc.git] DEBUG [detached HEAD d324126] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:03,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:03,003 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:03,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-11 10:04:04,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-11 10:04:04,007 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:04:04,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-11 10:04:05,177 [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-11 10:04:05,887 [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-11 10:04:06,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-11 10:04:06,897 [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-11 10:04:06,898 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-11 10:04:07,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-11 10:04:07,335 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:04:08,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-11 10:04:08,723 [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-11 10:04:09,182 [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-11 10:04:09,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-11 10:04:10,092 [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-11 10:04:10,093 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-11 10:04:10,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-11 10:04:10,535 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-11 10:04:11,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-11 10:04:11,730 [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-11 10:04:12,228 [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-11 10:04:12,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-11 10:04:13,217 [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-11 10:04:13,217 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-11 10:04:13,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-11 10:04:14,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-11 10:04:14,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-11 10:04:15,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-11 10:04:15,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-11 10:04:16,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-11 10:04:16,080 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:16,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-11 10:04:16,081 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:16,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:16,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:16,094 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:16,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:16,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:16,106 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:16,107 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-11 10:04:16,401 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-11 10:04:16,401 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-11 10:04:16,407 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-11 10:04:16,688 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-11 10:04:16,688 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-11 10:04:16,694 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-11 10:04:17,062 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-11 10:04:17,062 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-11 10:04:17,068 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:17,068 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:17,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:17,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-11 10:04:17,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:17,090 [ 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-11 10:04:17,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:17,106 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-11 10:04:17,106 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-11 10:04:17,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:17,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-11 10:04:17,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:17,256 [ 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-11 10:04:17,347 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-11 10:04:17,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:17,351 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-11 10:04:17,351 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-11 10:04:17,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:17,628 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-11 10:04:17,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:17,645 [ 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-11 10:04:17,658 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-11 10:04:17,659 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:17,662 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-11 10:04:17,662 [ scc.git] DEBUG package.json | 2 +-
2024-09-11 10:04:17,662 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-11 10:04:18,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:18,017 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:18,062 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:18,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:18,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:18,112 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:18,119 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d074c70> has no local changes
2024-09-11 10:04:18,119 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:18,128 [ scc.git] DEBUG [detached HEAD 38534b6] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:18,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:18,129 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:18,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-11 10:04:18,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-11 10:04:19,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-11 10:04:19,924 [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-11 10:04:20,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-11 10:04:20,735 [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-11 10:04:20,736 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-11 10:04:20,736 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:20,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-11 10:04:20,736 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:20,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:20,743 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:20,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:20,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:20,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:20,764 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:20,764 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-11 10:04:21,113 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-11 10:04:21,113 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-11 10:04:21,119 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:21,120 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:21,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:21,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-11 10:04:21,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:21,140 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-11 10:04:21,150 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:21,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:21,292 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:21,362 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:21,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:21,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:21,416 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:21,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d079e80> has no local changes
2024-09-11 10:04:21,425 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:21,436 [ scc.git] DEBUG [detached HEAD 8480f51] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:21,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:21,437 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:21,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-11 10:04:22,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-11 10:04:22,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-11 10:04:23,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-11 10:04:23,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-11 10:04:24,154 [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-11 10:04:24,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-11 10:04:24,995 [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-11 10:04:24,996 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-11 10:04:24,996 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:24,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-11 10:04:24,996 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:24,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:25,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:25,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:25,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:25,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:25,026 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:25,026 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-11 10:04:25,398 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-11 10:04:25,398 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-11 10:04:25,407 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:25,408 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:25,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:25,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-11 10:04:25,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:25,436 [ 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-11 10:04:25,455 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-11 10:04:25,457 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:25,461 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-11 10:04:25,461 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-11 10:04:25,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:25,608 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:25,666 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:25,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:25,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:25,726 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:25,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562d065a30> has no local changes
2024-09-11 10:04:25,736 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:25,749 [ scc.git] DEBUG [detached HEAD 0e44400] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:25,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:25,750 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:26,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-11 10:04:26,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-11 10:04:27,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-11 10:04:27,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-11 10:04:28,135 [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-11 10:04:28,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-11 10:04:29,132 [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-11 10:04:29,133 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-11 10:04:29,133 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:29,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-11 10:04:29,133 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:29,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:29,140 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:29,148 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:29,149 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:29,159 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:29,166 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:29,167 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-11 10:04:29,758 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-11 10:04:29,758 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-11 10:04:29,763 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:29,763 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:29,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:29,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-11 10:04:29,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:29,782 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-11 10:04:29,842 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG Auto-merging setup.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-11 10:04:29,842 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:29,843 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:29,849 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-11 10:04:29,856 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-11 10:04:30,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:30,004 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-11 10:04:30,010 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-11 10:04:30,017 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-09-11 10:04:30,023 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:30,023 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-11 10:04:30,024 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:30,070 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:30,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:30,078 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:30,147 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:30,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c7d34c0> has no local changes
2024-09-11 10:04:30,180 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:30,197 [ scc.git] DEBUG [detached HEAD 8c04389] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:30,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:30,201 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:30,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-11 10:04:31,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-11 10:04:31,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-11 10:04:31,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-11 10:04:32,460 [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-11 10:04:32,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-11 10:04:33,355 [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-11 10:04:33,356 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-11 10:04:33,356 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:33,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-11 10:04:33,356 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:33,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:33,363 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:33,369 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:33,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:33,376 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:33,383 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:33,383 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-11 10:04:33,750 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-11 10:04:33,750 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-11 10:04:33,756 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:33,756 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:33,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:33,764 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-11 10:04:33,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:33,780 [ 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-11 10:04:33,795 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-11 10:04:33,799 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-11 10:04:33,802 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-11 10:04:33,802 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-11 10:04:33,802 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-11 10:04:33,802 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-11 10:04:33,802 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-11 10:04:33,802 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-11 10:04:33,803 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-11 10:04:33,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:33,945 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:33,999 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:33,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:34,131 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:34,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f562c03df40> has no local changes
2024-09-11 10:04:34,145 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:34,163 [ scc.git] DEBUG [detached HEAD d24ead5] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:34,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:34,164 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:34,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-11 10:04:34,348 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:34,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-11 10:04:34,349 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,358 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:34,366 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:34,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:34,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:34,386 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:34,386 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:34,386 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,395 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:34,446 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:34,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:34,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c7bc280> has no local changes
2024-09-11 10:04:34,508 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:34,519 [ scc.git] DEBUG [detached HEAD 9690ef7] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:34,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:34,520 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:34,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-11 10:04:34,782 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:34,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-11 10:04:34,782 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:34,808 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:34,808 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:34,824 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:34,838 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:34,839 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:34,839 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,846 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:34,904 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:34,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:34,913 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:34,963 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:34,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c77a940> has no local changes
2024-09-11 10:04:34,973 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:34,985 [ scc.git] DEBUG [detached HEAD 90a9143] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:34,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:34,986 [ scc.git] INFO Overriding base-branch from master to main
2024-09-11 10:04:34,986 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:35,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-11 10:04:35,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-11 10:04:36,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-11 10:04:36,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-11 10:04:37,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-11 10:04:37,638 [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-11 10:04:38,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-11 10:04:38,486 [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-11 10:04:38,487 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-11 10:04:38,487 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:38,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-11 10:04:38,488 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:38,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:38,496 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-11 10:04:38,505 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:38,506 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-11 10:04:38,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-11 10:04:38,528 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:38,528 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-11 10:04:38,946 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-11 10:04:38,947 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-11 10:04:38,952 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:38,952 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:38,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:38,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-11 10:04:38,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:38,981 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-11 10:04:39,082 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-11 10:04:39,082 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-11 10:04:39,082 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:39,083 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:39,096 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-11 10:04:39,108 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-11 10:04:39,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:39,254 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-11 10:04:39,281 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-11 10:04:39,300 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-11 10:04:39,310 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:39,310 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-11 10:04:39,311 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:39,376 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:39,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:39,384 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:39,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:39,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c7ab670> has no local changes
2024-09-11 10:04:39,482 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:39,494 [ scc.git] DEBUG [detached HEAD a9c0b01] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:39,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:39,494 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:39,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-11 10:04:39,669 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:39,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-11 10:04:39,669 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:39,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:39,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:39,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:39,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:39,687 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:39,695 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:39,695 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:39,695 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:39,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:39,703 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:39,755 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:39,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:39,762 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:39,811 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:39,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c7ace80> has no local changes
2024-09-11 10:04:39,818 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:39,827 [ scc.git] DEBUG [detached HEAD c9bf74b] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:39,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:39,828 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:40,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-11 10:04:40,131 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:40,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-11 10:04:40,131 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:40,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:40,138 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:40,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:40,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:40,154 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:40,162 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:40,162 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:40,162 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:40,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:40,169 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:40,221 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:40,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:40,230 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:40,284 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:40,293 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c752640> has no local changes
2024-09-11 10:04:40,293 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:40,305 [ scc.git] DEBUG [detached HEAD 7423a73] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:40,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:40,306 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:40,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-11 10:04:41,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-11 10:04:41,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-11 10:04:42,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-11 10:04:42,509 [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-11 10:04:42,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-11 10:04:43,397 [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-11 10:04:43,397 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-11 10:04:43,398 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:43,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-11 10:04:43,398 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:43,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:43,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-11 10:04:43,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:43,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-11 10:04:43,421 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-11 10:04:43,429 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:43,429 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-11 10:04:43,835 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-11 10:04:43,835 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-11 10:04:43,839 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:43,840 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:43,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:43,846 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-11 10:04:43,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:43,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-11 10:04:43,902 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-11 10:04:43,902 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-11 10:04:43,903 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:43,904 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:43,912 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-11 10:04:43,921 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-11 10:04:44,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:44,059 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-11 10:04:44,067 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-11 10:04:44,074 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-11 10:04:44,083 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:44,083 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-11 10:04:44,083 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:44,130 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:44,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:44,139 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:44,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:44,194 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c763d90> has no local changes
2024-09-11 10:04:44,194 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:44,205 [ scc.git] DEBUG [detached HEAD d5a829a] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:44,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:44,206 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-11 10:04:44,206 [ scc.repo] DEBUG ## PRs found:
2024-09-11 10:04:44,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-11 10:04:45,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-11 10:04:45,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-11 10:04:46,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-11 10:04:46,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-11 10:04:47,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-11 10:04:47,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-11 10:04:47,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-11 10:04:48,346 [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-11 10:04:48,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-11 10:04:49,160 [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-11 10:04:49,161 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-11 10:04:49,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-11 10:04:50,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-11 10:04:50,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-11 10:04:51,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-11 10:04:51,043 [ scc.repo] DEBUG ## Branches found:
2024-09-11 10:04:51,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-11 10:04:51,043 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:51,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:51,052 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-11 10:04:51,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-11 10:04:51,060 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-11 10:04:51,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-11 10:04:51,078 [ scc.git] DEBUG Already up to date.
2024-09-11 10:04:51,078 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-11 10:04:51,938 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-11 10:04:51,938 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-11 10:04:51,946 [ scc.git] DEBUG ## Unique users: []
2024-09-11 10:04:51,946 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:51,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:51,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-11 10:04:51,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:51,968 [ 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-11 10:04:52,133 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-11 10:04:52,134 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-11 10:04:52,134 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-11 10:04:52,134 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-11 10:04:52,142 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-11 10:04:52,150 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-11 10:04:52,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:52,282 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-11 10:04:52,291 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-11 10:04:52,298 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#180](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-11 10:04:52,304 [ scc.config] DEBUG Found github.token
2024-09-11 10:04:52,305 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-11 10:04:52,309 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-11 10:04:52,362 [ scc.git] DEBUG Get sha1 of %s
2024-09-11 10:04:52,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-11 10:04:52,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:52,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:04:52,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560c784e20> has no local changes
2024-09-11 10:04:52,419 [ 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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:04:52,428 [ scc.git] DEBUG [detached HEAD 8fb2242] merge master -Dorg -Ssuccess-only
2024-09-11 10:04:52,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:04:52,429 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-11 10:04:52,510 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-11 10:04:52,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:52,693 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-11 10:04:52,699 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-11 10:04:53,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:53,068 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-11 10:04:53,073 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-11 10:04:53,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:53,448 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-11 10:04:53,454 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-11 10:04:53,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:53,853 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-11 10:04:54,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:54,239 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-11 10:04:54,246 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-11 10:04:54,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:54,629 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-11 10:04:54,637 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-11 10:04:54,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:55,011 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-11 10:04:55,018 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-11 10:04:55,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:55,398 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-11 10:04:55,405 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-11 10:04:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:55,785 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-11 10:04:55,789 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-11 10:04:56,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:56,172 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-11 10:04:56,178 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-11 10:04:56,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:56,568 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-11 10:04:56,573 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-11 10:04:56,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:56,955 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-11 10:04:56,960 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-11 10:04:57,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:57,346 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-11 10:04:57,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:57,742 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-11 10:04:58,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:58,123 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-11 10:04:58,128 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-11 10:04:58,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:58,516 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-11 10:04:58,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:58,908 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-11 10:04:59,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:59,305 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-11 10:04:59,310 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-11 10:04:59,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:04:59,693 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-11 10:04:59,700 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-11 10:05:00,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:05:00,088 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-11 10:05:00,092 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-11 10:05:00,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:05:00,481 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-11 10:05:00,487 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-11 10:05:00,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-11 10:05:00,883 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-11 10:05:00,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-11 10:05:00,970 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5630eafe20> has local changes
2024-09-11 10:05:00,971 [ 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 390 dependabot[bot] 'Bump omero-figure from `5f62399` to `f9a321d`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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#180 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/180/)'
2024-09-11 10:05:00,986 [ scc.git] DEBUG [detached HEAD 45df298] merge master -Dorg -Ssuccess-only
2024-09-11 10:05:00,987 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-11 10:05:00,987 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-11 10:05:00,987 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 390 dependabot[bot] 'Bump omero-figure from `5f62399` to `f9a321d`'
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-11 10:05:00,987 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-11 10:05:00,987 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-11 10:05:00,987 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-11 10:05:00,987 [ scc.merge] INFO
2024-09-11 10:05:00,987 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-11 10:05:00,987 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-11 10:05:00,987 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-11 10:05:00,988 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-11 10:05:00,988 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-11 10:05:00,988 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-11 10:05:00,988 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-11 10:05:00,988 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,988 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,988 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-11 10:05:00,988 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,988 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-11 10:05:00,989 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-11 10:05:00,989 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-11 10:05:00,989 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-11 10:05:00,989 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-11 10:05:00,989 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,989 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-11 10:05:00,989 [ scc.merge] INFO
2024-09-11 10:05:00,989 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-11 10:05:00,990 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-11 10:05:00,990 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-11 10:05:00,990 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-11 10:05:00,990 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-11 10:05:00,990 [ scc.merge] INFO
2024-09-11 10:05:00,990 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-11 10:05:00,990 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,990 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-11 10:05:00,990 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,991 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-11 10:05:00,991 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,991 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-11 10:05:00,991 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Merged PRs:
2024-09-11 10:05:00,991 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-11 10:05:00,991 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-11 10:05:00,991 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-11 10:05:00,991 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,991 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-11 10:05:00,991 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,991 [ scc.merge] INFO
2024-09-11 10:05:00,991 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-11 10:05:00,992 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-11 10:05:00,992 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-11 10:05:00,992 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Repository: ome/scripts
2024-09-11 10:05:00,992 [ scc.merge] INFO Excluded PRs:
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-11 10:05:00,992 [ scc.merge] INFO Already up to date.
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-11 10:05:00,992 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-11 10:05:00,992 [ scc.merge] INFO
2024-09-11 10:05:00,992 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-11 10:05:00,992 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:00,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-11 10:05:00,998 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-11 10:05:01,004 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-11 10:05:01,010 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-11 10:05:01,016 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-11 10:05:01,021 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-11 10:05:01,026 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-11 10:05:01,032 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-11 10:05:01,038 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-11 10:05:01,043 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-11 10:05:01,050 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-11 10:05:01,056 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-11 10:05:01,061 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-11 10:05:01,067 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-11 10:05:01,073 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-11 10:05:01,078 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-11 10:05:01,084 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-11 10:05:01,090 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-11 10:05:01,096 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-11 10:05:01,104 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-11 10:05:01,112 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-11 10:05:01,117 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-11 10:05:01,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-11 10:05:01,123 [ scc.git] DEBUG Calling 'git remote'
2024-09-11 10:05:01,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.4-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD f3c3bb0] 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 f9a321dd
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 97b29ae] 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-11 10:05:48,006 [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-11 10:05:57,002 [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-11 10:05:59,286 [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-11 10:06:03,941 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-11 10:06:45,560 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
