Skipping 208 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-03-28 10:30:27,684 [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
2025-03-28 10:30:27,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:28,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-28 10:30:28,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:28,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:28,546 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-28 10:30:28,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:29,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227 HTTP/1.1" 200 None
2025-03-28 10:30:29,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:29,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227/comments HTTP/1.1" 200 None
2025-03-28 10:30:29,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:30,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97 HTTP/1.1" 200 None
2025-03-28 10:30:30,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:30,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:30:30,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:31,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:30:31,034 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:31,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-28 10:30:31,034 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:31,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:31,037 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:31,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:31,040 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:31,043 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:31,046 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:31,046 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-28 10:30:31,362 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-28 10:30:31,362 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-28 10:30:31,367 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-28 10:30:31,640 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-28 10:30:31,640 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-28 10:30:31,646 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-28 10:30:31,926 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-28 10:30:31,926 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-28 10:30:31,931 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-28 10:30:32,202 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-28 10:30:32,202 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-28 10:30:32,208 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-28 10:30:32,492 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-28 10:30:32,492 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-28 10:30:32,498 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:32,498 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:32,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:32,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-28 10:30:32,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:32,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-28 10:30:32,523 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-28 10:30:32,523 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-28 10:30:32,524 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:32,528 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-28 10:30:32,528 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-28 10:30:32,528 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-28 10:30:32,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:32,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:32,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-28 10:30:32,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:32,701 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-28 10:30:32,722 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-28 10:30:32,722 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-28 10:30:32,722 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-28 10:30:32,722 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-28 10:30:32,723 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:32,728 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-28 10:30:32,728 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-28 10:30:32,728 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-28 10:30:32,728 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-28 10:30:32,728 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-28 10:30:32,728 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-28 10:30:32,728 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-28 10:30:32,728 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-28 10:30:32,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:33,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:33,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-28 10:30:33,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:33,116 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-28 10:30:33,130 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-28 10:30:33,131 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:33,134 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-28 10:30:33,134 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-28 10:30:33,134 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-28 10:30:33,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:33,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:33,529 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-28 10:30:33,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:33,539 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-28 10:30:33,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:33,565 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-28 10:30:33,565 [ scc.git] DEBUG package.json | 2 +-
2025-03-28 10:30:33,565 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-28 10:30:33,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:33,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:33,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-28 10:30:33,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:33,953 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-28 10:30:33,993 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-28 10:30:33,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-28 10:30:33,993 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:30:33,994 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:30:33,997 [ scc.git] DEBUG Calling 'git reset --hard 89ae0f5b4ba9441768aed7403fdb979b639d55bd'
2025-03-28 10:30:34,005 [ scc.git] DEBUG HEAD is now at 89ae0f5 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-28 10:30:34,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:34,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:34,358 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-28 10:30:34,361 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-28 10:30:34,363 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-28 10:30:34,366 [ scc.config] DEBUG Found github.token
2025-03-28 10:30:34,366 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-28 10:30:34,366 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:30:34,406 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:34,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:34,408 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:30:34,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:30:34,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f328107d310> has no local changes
2025-03-28 10:30:34,452 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:30:34,461 [ scc.git] DEBUG [detached HEAD 9cc8296] merge master -Dorg -Ssuccess-only
2025-03-28 10:30:34,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:30:34,462 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:30:34,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:34,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-28 10:30:35,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:35,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-28 10:30:35,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:36,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-28 10:30:36,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:36,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-28 10:30:36,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:37,061 [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
2025-03-28 10:30:37,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:37,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-28 10:30:37,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:37,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:37,956 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-28 10:30:37,956 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:37,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-28 10:30:37,957 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:37,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:37,960 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:37,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:37,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:37,965 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:37,969 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:37,969 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-28 10:30:38,259 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-28 10:30:38,259 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-28 10:30:38,264 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:38,264 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:38,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:38,267 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-28 10:30:38,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:38,273 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-28 10:30:38,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:38,286 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-28 10:30:38,286 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-28 10:30:38,286 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-28 10:30:38,286 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-28 10:30:38,286 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-28 10:30:38,286 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-28 10:30:38,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:38,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:38,446 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:30:38,485 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:38,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:38,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:30:38,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:30:38,532 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f32810a5350> has no local changes
2025-03-28 10:30:38,532 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:30:38,538 [ scc.git] DEBUG [detached HEAD 57a8a66] merge master -Dorg -Ssuccess-only
2025-03-28 10:30:38,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:30:38,539 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:30:38,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:39,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-28 10:30:39,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:39,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-28 10:30:39,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:40,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-28 10:30:40,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:40,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-28 10:30:40,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:41,173 [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
2025-03-28 10:30:41,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:41,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-28 10:30:41,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:42,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:42,072 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-28 10:30:42,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:42,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-28 10:30:42,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:43,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-28 10:30:43,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:43,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-28 10:30:43,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:43,977 [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
2025-03-28 10:30:44,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:44,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-28 10:30:44,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:44,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:44,884 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-28 10:30:44,884 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:44,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-28 10:30:44,884 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:44,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:44,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:44,890 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:44,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:44,893 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:44,896 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:44,896 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-28 10:30:45,194 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-28 10:30:45,194 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-28 10:30:45,199 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-28 10:30:45,489 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-28 10:30:45,489 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-28 10:30:45,494 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:45,494 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:45,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:45,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-28 10:30:45,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:45,504 [ 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'
2025-03-28 10:30:45,517 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-28 10:30:45,517 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-28 10:30:45,517 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-28 10:30:45,517 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-28 10:30:45,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:30:45,518 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:30:45,521 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-28 10:30:45,526 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-28 10:30:45,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:45,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:45,690 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-28 10:30:45,695 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-28 10:30:45,698 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-28 10:30:45,700 [ scc.config] DEBUG Found github.token
2025-03-28 10:30:45,700 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-28 10:30:45,701 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-28 10:30:45,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:45,707 [ 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'
2025-03-28 10:30:45,723 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-28 10:30:45,723 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-28 10:30:45,723 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-28 10:30:45,723 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:30:45,723 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:30:45,727 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-28 10:30:45,732 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-28 10:30:45,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:46,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:46,117 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-28 10:30:46,122 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-28 10:30:46,125 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/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
2025-03-28 10:30:46,127 [ scc.config] DEBUG Found github.token
2025-03-28 10:30:46,127 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-28 10:30:46,127 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:30:46,167 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:46,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:46,169 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:30:46,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:30:46,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3282b978d0> has no local changes
2025-03-28 10:30:46,211 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:30:46,217 [ scc.git] DEBUG [detached HEAD 1554fbd] merge master -Dorg -Ssuccess-only
2025-03-28 10:30:46,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:30:46,218 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:30:46,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:46,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-28 10:30:46,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:47,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-28 10:30:47,197 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-28 10:30:47,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:47,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-28 10:30:47,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:48,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:30:48,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:48,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:30:48,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:49,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-28 10:30:49,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:49,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:49,597 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-28 10:30:49,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:50,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-28 10:30:50,084 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-28 10:30:50,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:50,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-28 10:30:50,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:51,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:30:51,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:51,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:30:51,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:52,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-28 10:30:52,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:52,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:30:52,569 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-28 10:30:52,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:53,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-28 10:30:53,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:53,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-28 10:30:53,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:54,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-28 10:30:54,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:54,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-28 10:30:54,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:55,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-28 10:30:55,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:55,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-28 10:30:55,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:56,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-28 10:30:56,132 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:56,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-28 10:30:56,132 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:56,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:56,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:56,138 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:56,138 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:56,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:56,144 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:56,145 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-28 10:30:56,497 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-28 10:30:56,497 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-28 10:30:56,502 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-28 10:30:56,761 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-28 10:30:56,762 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-28 10:30:56,767 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:56,767 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:56,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:56,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-28 10:30:56,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:56,775 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-28 10:30:56,783 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:56,786 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-28 10:30:56,786 [ scc.git] DEBUG package.json | 2 +-
2025-03-28 10:30:56,786 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-28 10:30:56,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:56,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:56,945 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-28 10:30:56,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:56,951 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-28 10:30:56,961 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-28 10:30:56,961 [ scc.git] DEBUG Auto-merging package.json
2025-03-28 10:30:56,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:30:56,965 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-28 10:30:56,965 [ scc.git] DEBUG package.json | 2 +-
2025-03-28 10:30:56,965 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-28 10:30:57,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:57,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:30:57,368 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:30:57,408 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:57,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:57,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:30:57,449 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:30:57,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3281130b10> has no local changes
2025-03-28 10:30:57,454 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:30:57,461 [ scc.git] DEBUG [detached HEAD 45be911] merge master -Dorg -Ssuccess-only
2025-03-28 10:30:57,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:30:57,461 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:30:57,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:57,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-28 10:30:57,853 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:57,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-28 10:30:57,853 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:57,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:57,856 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:57,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:57,858 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:57,862 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:57,865 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:57,865 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:57,865 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:57,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:57,867 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:30:57,907 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:57,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:57,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:30:57,952 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:30:57,955 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3281130d90> has no local changes
2025-03-28 10:30:57,956 [ 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.
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:30:57,962 [ scc.git] DEBUG [detached HEAD 3eaf856] merge master -Dorg -Ssuccess-only
2025-03-28 10:30:57,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:30:57,963 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:30:58,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:58,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-28 10:30:58,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:58,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-28 10:30:59,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:59,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-28 10:30:59,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:30:59,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-28 10:30:59,963 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:30:59,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-28 10:30:59,963 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:59,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:59,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:30:59,969 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:30:59,969 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:30:59,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:30:59,975 [ scc.git] DEBUG Already up to date.
2025-03-28 10:30:59,975 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:30:59,975 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:30:59,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:30:59,977 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:00,016 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:00,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:00,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:00,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:00,060 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f328104a5d0> has no local changes
2025-03-28 10:31:00,060 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:00,066 [ scc.git] DEBUG [detached HEAD 5bff252] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:00,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:00,067 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:00,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:00,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-28 10:31:00,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:00,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-28 10:31:01,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:01,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-28 10:31:01,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:01,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-28 10:31:02,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:02,437 [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
2025-03-28 10:31:02,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:02,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-28 10:31:03,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:03,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:03,337 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-28 10:31:03,337 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:03,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-28 10:31:03,337 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:03,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:03,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:03,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:03,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:03,346 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:03,349 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:03,349 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-28 10:31:03,626 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-28 10:31:03,626 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-28 10:31:03,632 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:03,632 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:03,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:03,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-28 10:31:03,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:03,641 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-28 10:31:03,652 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG Auto-merging setup.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-28 10:31:03,653 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:31:03,654 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:31:03,657 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-28 10:31:03,661 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-28 10:31:03,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:03,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:03,831 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-28 10:31:03,834 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-28 10:31:03,838 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-28 10:31:03,840 [ scc.config] DEBUG Found github.token
2025-03-28 10:31:03,840 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-28 10:31:03,840 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:03,884 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:03,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:03,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:03,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:03,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f30dd0> has no local changes
2025-03-28 10:31:03,933 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:03,940 [ scc.git] DEBUG [detached HEAD aeb7abe] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:03,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:03,941 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:04,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:04,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-28 10:31:04,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:04,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-28 10:31:05,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:05,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-28 10:31:05,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:05,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-28 10:31:06,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:06,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:31:06,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:06,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:31:07,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:07,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-28 10:31:07,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:07,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-28 10:31:08,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:08,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-28 10:31:08,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:08,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-28 10:31:09,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:09,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-28 10:31:09,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:09,836 [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
2025-03-28 10:31:10,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:10,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-28 10:31:10,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:10,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:10,823 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-28 10:31:10,823 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:10,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-28 10:31:10,824 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:10,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:10,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:10,829 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:10,829 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:10,832 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:10,835 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:10,836 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-28 10:31:11,130 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-28 10:31:11,130 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-28 10:31:11,135 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:11,135 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:11,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-28 10:31:11,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,145 [ 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'
2025-03-28 10:31:11,157 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-28 10:31:11,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-28 10:31:11,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-28 10:31:11,162 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-28 10:31:11,163 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-28 10:31:11,163 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-28 10:31:11,163 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-28 10:31:11,163 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-28 10:31:11,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:11,323 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:11,365 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:11,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,367 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:11,406 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:11,411 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f14790> has no local changes
2025-03-28 10:31:11,411 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:11,418 [ scc.git] DEBUG [detached HEAD a6e882c] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:11,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:11,419 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:11,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:11,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-28 10:31:11,770 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:11,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-28 10:31:11,770 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:11,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:11,775 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:11,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:11,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:11,781 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:11,781 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:11,781 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:11,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:11,823 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:11,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:11,826 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:11,865 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:11,868 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f47550> has no local changes
2025-03-28 10:31:11,868 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:11,874 [ scc.git] DEBUG [detached HEAD da8ec3e] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:11,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:11,875 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:12,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:12,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-28 10:31:12,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:12,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-28 10:31:13,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:13,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-28 10:31:13,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:13,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-28 10:31:14,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:14,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:31:14,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:14,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:31:15,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:15,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-28 10:31:15,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:15,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:15,698 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-28 10:31:15,698 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:15,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-28 10:31:15,698 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:15,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:15,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:15,704 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:15,704 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:15,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:15,710 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:15,710 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-28 10:31:15,994 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-28 10:31:15,994 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-28 10:31:15,999 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:15,999 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:15,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:16,002 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-28 10:31:16,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:16,007 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-28 10:31:16,014 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:31:16,017 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-28 10:31:16,017 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-28 10:31:16,017 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-28 10:31:16,018 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-28 10:31:16,018 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-28 10:31:16,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:16,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:16,189 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:16,260 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:16,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:16,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:16,343 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:16,350 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f1aa90> has no local changes
2025-03-28 10:31:16,350 [ 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.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:16,359 [ scc.git] DEBUG [detached HEAD b9e97ff] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:16,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:16,360 [ scc.git] INFO Overriding base-branch from master to main
2025-03-28 10:31:16,360 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:16,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:16,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-28 10:31:16,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:17,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-28 10:31:17,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:17,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-28 10:31:17,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:18,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-28 10:31:18,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:18,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:31:18,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:19,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:31:19,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:19,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-28 10:31:20,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:20,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-28 10:31:20,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:20,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-28 10:31:20,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:21,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-28 10:31:21,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:21,799 [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
2025-03-28 10:31:22,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:22,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-28 10:31:22,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:22,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:22,774 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-28 10:31:22,775 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:22,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-28 10:31:22,775 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:22,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:22,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-28 10:31:22,780 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:22,780 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-28 10:31:22,783 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-28 10:31:22,787 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:22,787 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-28 10:31:23,089 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-28 10:31:23,089 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-28 10:31:23,095 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:23,095 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:23,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-28 10:31:23,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-28 10:31:23,110 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-28 10:31:23,110 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-28 10:31:23,111 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:31:23,111 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:31:23,114 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-28 10:31:23,118 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-28 10:31:23,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:23,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:23,289 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-28 10:31:23,293 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-28 10:31:23,296 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-28 10:31:23,298 [ scc.config] DEBUG Found github.token
2025-03-28 10:31:23,298 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-28 10:31:23,298 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:23,336 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:23,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,339 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:23,377 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:23,381 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f383d0> has no local changes
2025-03-28 10:31:23,381 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:23,388 [ scc.git] DEBUG [detached HEAD 1ea5427] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:23,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:23,388 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:23,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:23,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-28 10:31:23,738 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:23,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-28 10:31:23,739 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:23,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:23,744 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:23,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:23,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:23,750 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:23,750 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:23,750 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:23,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,752 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:23,792 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:23,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:23,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:23,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:23,837 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f84390> has no local changes
2025-03-28 10:31:23,837 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:23,843 [ scc.git] DEBUG [detached HEAD 9373fed] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:23,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:23,843 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:23,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:24,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-28 10:31:24,173 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:24,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-28 10:31:24,173 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:24,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:24,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:24,178 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:24,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:24,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:24,184 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:24,185 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:24,185 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:24,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:24,187 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:24,225 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:24,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:24,227 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:24,267 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:24,270 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f6b810> has no local changes
2025-03-28 10:31:24,270 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:24,276 [ scc.git] DEBUG [detached HEAD 4bcc7ef] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:24,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:24,277 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:24,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:24,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-28 10:31:24,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:25,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-28 10:31:25,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:25,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-28 10:31:25,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:26,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-28 10:31:26,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:26,628 [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
2025-03-28 10:31:26,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:27,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-28 10:31:27,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:27,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:27,520 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-28 10:31:27,521 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:27,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-28 10:31:27,521 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:27,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:27,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-28 10:31:27,526 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:27,527 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-28 10:31:27,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-28 10:31:27,532 [ scc.git] DEBUG Already up to date.
2025-03-28 10:31:27,533 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-28 10:31:27,828 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-28 10:31:27,828 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-28 10:31:27,832 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:27,832 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:27,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:27,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-28 10:31:27,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:27,840 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-28 10:31:27,849 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-28 10:31:27,849 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-28 10:31:27,849 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:31:27,849 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:31:27,852 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-28 10:31:27,857 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-28 10:31:27,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:28,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:28,042 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-28 10:31:28,046 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-28 10:31:28,049 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-28 10:31:28,051 [ scc.config] DEBUG Found github.token
2025-03-28 10:31:28,051 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-28 10:31:28,051 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:28,091 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:28,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:28,093 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:28,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:28,137 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3279f23e10> has no local changes
2025-03-28 10:31:28,137 [ 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#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:28,144 [ scc.git] DEBUG [detached HEAD 4a50ced] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:28,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:28,144 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-28 10:31:28,144 [ scc.repo] DEBUG ## PRs found:
2025-03-28 10:31:28,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:28,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-28 10:31:28,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:29,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-28 10:31:29,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:29,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-28 10:31:29,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:30,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-28 10:31:30,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:30,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-28 10:31:30,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:31,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-28 10:31:31,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:31,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-28 10:31:31,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:31,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:31,986 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-28 10:31:32,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:32,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-28 10:31:32,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:32,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-28 10:31:33,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:33,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-28 10:31:33,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:33,953 [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
2025-03-28 10:31:34,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:34,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-28 10:31:34,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:34,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-28 10:31:34,863 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-28 10:31:35,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:35,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-28 10:31:35,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:35,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-28 10:31:36,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:36,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-28 10:31:36,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:36,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-28 10:31:36,943 [ scc.repo] DEBUG ## Branches found:
2025-03-28 10:31:36,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-28 10:31:36,943 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:36,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:36,946 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-28 10:31:36,949 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-28 10:31:36,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-28 10:31:36,952 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-28 10:31:36,960 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-28 10:31:37,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:37,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-28 10:31:37,588 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-28 10:31:37,917 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-28 10:31:37,918 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-28 10:31:37,923 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-28 10:31:38,196 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-28 10:31:38,196 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-28 10:31:38,202 [ scc.git] DEBUG ## Unique users: []
2025-03-28 10:31:38,202 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:38,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:38,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-28 10:31:38,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:38,213 [ 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'
2025-03-28 10:31:38,223 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-03-28 10:31:38,224 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-28 10:31:38,224 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-28 10:31:38,226 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-28 10:31:38,230 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-28 10:31:38,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:38,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:38,395 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-28 10:31:38,400 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-28 10:31:38,404 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#370](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-28 10:31:38,406 [ scc.config] DEBUG Found github.token
2025-03-28 10:31:38,406 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-28 10:31:38,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-28 10:31:38,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:38,413 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-28 10:31:38,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-28 10:31:38,425 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-28 10:31:38,425 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-28 10:31:38,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:38,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:38,854 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-28 10:31:38,895 [ scc.git] DEBUG Get sha1 of %s
2025-03-28 10:31:38,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-28 10:31:38,897 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:38,935 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:38,939 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f32811456d0> has no local changes
2025-03-28 10:31:38,939 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:38,946 [ scc.git] DEBUG [detached HEAD 5c79543] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:38,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:38,946 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-28 10:31:39,022 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-28 10:31:39,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:39,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:39,271 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-28 10:31:39,273 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-28 10:31:39,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:39,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:39,697 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-28 10:31:39,699 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-28 10:31:39,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:40,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:40,108 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-28 10:31:40,111 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-28 10:31:40,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:40,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:40,585 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-28 10:31:40,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:40,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:40,997 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-28 10:31:40,999 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-28 10:31:41,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:41,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:41,412 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-28 10:31:41,414 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-28 10:31:41,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:41,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:41,819 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-28 10:31:41,822 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-28 10:31:42,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:42,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:42,254 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-28 10:31:42,256 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-28 10:31:42,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:42,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:42,661 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-28 10:31:42,663 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-28 10:31:42,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:43,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:43,074 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-28 10:31:43,077 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-28 10:31:43,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:43,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:43,518 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-28 10:31:43,520 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-28 10:31:43,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:43,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:43,934 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-28 10:31:43,936 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-28 10:31:44,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:44,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:44,351 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-28 10:31:44,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:44,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:44,762 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-28 10:31:45,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:45,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:45,175 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-28 10:31:45,178 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-28 10:31:45,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:45,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:45,585 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-28 10:31:45,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:45,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:46,003 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-28 10:31:46,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:46,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:46,415 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-28 10:31:46,418 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-28 10:31:46,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:46,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:46,833 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-28 10:31:46,835 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-28 10:31:47,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:47,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:47,239 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-28 10:31:47,241 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-28 10:31:47,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:47,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:47,665 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-28 10:31:47,667 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-28 10:31:47,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-28 10:31:48,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-28 10:31:48,079 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-28 10:31:48,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-28 10:31:48,168 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3283701a90> has local changes
2025-03-28 10:31:48,168 [ 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 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
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.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- 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'
- PR 167 dominikl 'Add extinfo command'
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 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
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.
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 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
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
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
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.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#370 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/370/)'
2025-03-28 10:31:48,182 [ scc.git] DEBUG [detached HEAD 08460d6] merge master -Dorg -Ssuccess-only
2025-03-28 10:31:48,182 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-28 10:31:48,182 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-28 10:31:48,182 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,182 [ scc.merge] INFO
2025-03-28 10:31:48,182 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,182 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-28 10:31:48,182 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-28 10:31:48,182 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-28 10:31:48,182 [ scc.merge] INFO
2025-03-28 10:31:48,182 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-28 10:31:48,182 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,182 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-28 10:31:48,183 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-28 10:31:48,183 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-28 10:31:48,183 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-28 10:31:48,183 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-28 10:31:48,183 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-28 10:31:48,183 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-28 10:31:48,183 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-28 10:31:48,183 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,183 [ scc.merge] INFO
2025-03-28 10:31:48,183 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,183 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-28 10:31:48,184 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-28 10:31:48,184 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-28 10:31:48,184 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-03-28 10:31:48,184 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,184 [ scc.merge] INFO
2025-03-28 10:31:48,184 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-28 10:31:48,184 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-28 10:31:48,185 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-28 10:31:48,185 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-28 10:31:48,185 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-28 10:31:48,185 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-28 10:31:48,185 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-28 10:31:48,185 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO
2025-03-28 10:31:48,185 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-28 10:31:48,185 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-28 10:31:48,185 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-28 10:31:48,186 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-28 10:31:48,186 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,186 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,186 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-28 10:31:48,186 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,186 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-28 10:31:48,187 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-28 10:31:48,187 [ scc.merge] INFO Already up to date.
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Repository: ome/scripts
2025-03-28 10:31:48,187 [ scc.merge] INFO Excluded PRs:
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-28 10:31:48,187 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-28 10:31:48,187 [ scc.merge] INFO Previously merged:
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Merged PRs:
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-28 10:31:48,187 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-28 10:31:48,187 [ scc.merge] INFO
2025-03-28 10:31:48,187 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-28 10:31:48,187 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-28 10:31:48,189 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-28 10:31:48,192 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-28 10:31:48,194 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-28 10:31:48,196 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-28 10:31:48,198 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-28 10:31:48,201 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-28 10:31:48,203 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-28 10:31:48,206 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-28 10:31:48,208 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-28 10:31:48,210 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-28 10:31:48,212 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-28 10:31:48,214 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-28 10:31:48,216 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-28 10:31:48,219 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-28 10:31:48,221 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-28 10:31:48,223 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-28 10:31:48,225 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-28 10:31:48,228 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-28 10:31:48,230 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-28 10:31:48,232 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-28 10:31:48,235 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-28 10:31:48,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-28 10:31:48,237 [ scc.git] DEBUG Calling 'git remote'
2025-03-28 10:31:48,240 [ 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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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.10.0 to 5.10.2
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 42d6af1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
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 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
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 100f6ae
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 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 99d32f3] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-28 10:32:36,789 [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
2025-03-28 10:32:46,236 [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
2025-03-28 10:32:48,784 [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
2025-03-28 10:32:53,630 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-28 10:33:36,130 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
