Skipping 208 KB..
Full Log2025-03-31 01:50:59,615 [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-31 01:50:59,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:00,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-31 01:51:00,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:00,503 [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-31 01:51:00,504 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-31 01:51:00,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:00,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227 HTTP/1.1" 200 None
2025-03-31 01:51:01,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:01,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227/comments HTTP/1.1" 200 None
2025-03-31 01:51:01,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:02,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97 HTTP/1.1" 200 None
2025-03-31 01:51:02,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:02,533 [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-31 01:51:02,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:03,070 [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-31 01:51:03,071 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:03,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-31 01:51:03,072 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:03,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:03,075 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:03,077 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:03,077 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:03,080 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:03,084 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:03,084 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-31 01:51:03,373 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-31 01:51:03,373 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-31 01:51:03,377 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-31 01:51:03,653 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-31 01:51:03,654 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-31 01:51:03,658 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-31 01:51:03,935 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-31 01:51:03,935 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-31 01:51:03,939 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-31 01:51:04,201 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-31 01:51:04,201 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-31 01:51:04,206 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-31 01:51:04,465 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-31 01:51:04,465 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-31 01:51:04,469 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:04,469 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:04,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:04,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-31 01:51:04,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:04,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-31 01:51:04,495 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-31 01:51:04,495 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-31 01:51:04,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:04,499 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-31 01:51:04,499 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-31 01:51:04,499 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-31 01:51:04,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:04,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:04,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-31 01:51:04,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:04,666 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-31 01:51:04,685 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-31 01:51:04,686 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-31 01:51:04,686 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-31 01:51:04,686 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-31 01:51:04,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:04,691 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-31 01:51:04,691 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-31 01:51:04,691 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-31 01:51:04,691 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-31 01:51:04,691 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-31 01:51:04,691 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-31 01:51:04,691 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-31 01:51:04,691 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-31 01:51:04,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:05,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:05,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-31 01:51:05,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:05,076 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-31 01:51:05,090 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-31 01:51:05,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:05,094 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-31 01:51:05,094 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-31 01:51:05,094 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-31 01:51:05,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:05,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:05,480 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-31 01:51:05,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:05,489 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-31 01:51:05,504 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:05,514 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-31 01:51:05,514 [ scc.git] DEBUG package.json | 2 +-
2025-03-31 01:51:05,514 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-31 01:51:05,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:05,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:05,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-31 01:51:05,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:05,896 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-31 01:51:05,934 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-31 01:51:05,934 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-31 01:51:05,935 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:51:05,935 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:51:05,938 [ scc.git] DEBUG Calling 'git reset --hard db2f4272353174ea4556ea1bb0a6c9afee9c0a65'
2025-03-31 01:51:05,946 [ scc.git] DEBUG HEAD is now at db2f427 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-31 01:51:06,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:06,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:06,301 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-31 01:51:06,304 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-31 01:51:06,307 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-31 01:51:06,309 [ scc.config] DEBUG Found github.token
2025-03-31 01:51:06,309 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-31 01:51:06,309 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:06,347 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:06,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:06,349 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:06,386 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:06,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5254d0bd0> has no local changes
2025-03-31 01:51:06,393 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:06,400 [ scc.git] DEBUG [detached HEAD 5a88ff0] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:06,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:06,400 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:06,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:06,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-31 01:51:07,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:07,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-31 01:51:07,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:07,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-31 01:51:08,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:08,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-31 01:51:08,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:08,924 [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-31 01:51:09,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:09,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-31 01:51:09,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:09,887 [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-31 01:51:09,888 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-31 01:51:09,888 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:09,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-31 01:51:09,888 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:09,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:09,891 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:09,893 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:09,893 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:09,896 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:09,900 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:09,900 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-31 01:51:10,241 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-31 01:51:10,242 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-31 01:51:10,246 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:10,246 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:10,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:10,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-31 01:51:10,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:10,255 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-31 01:51:10,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:10,267 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-31 01:51:10,267 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-31 01:51:10,267 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-31 01:51:10,267 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-31 01:51:10,267 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-31 01:51:10,267 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-31 01:51:10,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:10,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:10,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:10,472 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:10,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:10,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:10,513 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:10,517 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd525448550> has no local changes
2025-03-31 01:51:10,517 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:10,524 [ scc.git] DEBUG [detached HEAD 4b3846d] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:10,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:10,524 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:10,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:13,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-31 01:51:14,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:14,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-31 01:51:14,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:14,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-31 01:51:15,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:15,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-31 01:51:15,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:15,955 [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-31 01:51:16,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:16,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-31 01:51:16,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:16,952 [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-31 01:51:16,952 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-31 01:51:17,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:17,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-31 01:51:17,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:17,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-31 01:51:18,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:18,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-31 01:51:18,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:18,915 [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-31 01:51:19,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:24,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-31 01:51:24,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:24,912 [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-31 01:51:24,913 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-31 01:51:24,913 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:24,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-31 01:51:24,914 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:24,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:24,916 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:24,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:24,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:24,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:24,925 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:24,925 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-31 01:51:25,220 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-31 01:51:25,220 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-31 01:51:25,224 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-31 01:51:25,491 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-31 01:51:25,491 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-31 01:51:25,495 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:25,495 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:25,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:25,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-31 01:51:25,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:25,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-31 01:51:25,517 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-31 01:51:25,517 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-31 01:51:25,517 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-31 01:51:25,517 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-31 01:51:25,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:51:25,518 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:51:25,521 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-31 01:51:25,525 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-31 01:51:25,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:25,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:25,701 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-31 01:51:25,706 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-31 01:51:25,710 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-31 01:51:25,712 [ scc.config] DEBUG Found github.token
2025-03-31 01:51:25,712 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-31 01:51:25,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-31 01:51:25,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:25,719 [ 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-31 01:51:25,734 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-31 01:51:25,734 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-31 01:51:25,734 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-31 01:51:25,734 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:51:25,734 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:51:25,737 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-31 01:51:25,742 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-31 01:51:25,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:26,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:26,114 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-31 01:51:26,119 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-31 01:51:26,122 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/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-31 01:51:26,124 [ scc.config] DEBUG Found github.token
2025-03-31 01:51:26,124 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-31 01:51:26,124 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:26,162 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:26,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:26,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:26,201 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:26,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd52551e450> has no local changes
2025-03-31 01:51:26,206 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:26,212 [ scc.git] DEBUG [detached HEAD f8c964e] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:26,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:26,212 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:26,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:26,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-31 01:51:26,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-31 01:51:27,177 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-31 01:51:27,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:27,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-31 01:51:28,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:28,245 [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-31 01:51:28,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:28,747 [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-31 01:51:28,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:29,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-31 01:51:29,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:29,734 [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-31 01:51:29,734 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-31 01:51:29,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:30,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-31 01:51:30,221 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-31 01:51:30,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:30,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-31 01:51:31,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:31,354 [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-31 01:51:31,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:31,850 [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-31 01:51:32,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:32,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-31 01:51:32,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:32,855 [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-31 01:51:32,856 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-31 01:51:33,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:33,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-31 01:51:33,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:33,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-31 01:51:34,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:34,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-31 01:51:34,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:34,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-31 01:51:35,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:35,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-31 01:51:35,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:35,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-31 01:51:36,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:36,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-31 01:51:36,430 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:36,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-31 01:51:36,431 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:36,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:36,433 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:36,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:36,436 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:36,439 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:36,442 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:36,442 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-31 01:51:36,739 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-31 01:51:36,739 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-31 01:51:36,743 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-31 01:51:37,025 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-31 01:51:37,025 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-31 01:51:37,029 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:37,029 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:37,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:37,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-31 01:51:37,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:37,037 [ 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-31 01:51:37,045 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:37,049 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-31 01:51:37,049 [ scc.git] DEBUG package.json | 2 +-
2025-03-31 01:51:37,049 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-31 01:51:37,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:37,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:37,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-31 01:51:37,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:37,227 [ 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-31 01:51:37,236 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-31 01:51:37,236 [ scc.git] DEBUG Auto-merging package.json
2025-03-31 01:51:37,237 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:37,241 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-31 01:51:37,241 [ scc.git] DEBUG package.json | 2 +-
2025-03-31 01:51:37,241 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-31 01:51:37,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:37,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:37,637 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:37,677 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:37,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:37,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:37,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:37,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd52431d510> has no local changes
2025-03-31 01:51:37,722 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:37,728 [ scc.git] DEBUG [detached HEAD 71a408f] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:37,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:37,729 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:37,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:38,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-31 01:51:38,101 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:38,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-31 01:51:38,101 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:38,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:38,104 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:38,106 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:38,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:38,109 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:38,112 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:38,112 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:38,112 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:38,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:38,114 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:38,152 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:38,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:38,154 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:38,191 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:38,195 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5254d0550> has no local changes
2025-03-31 01:51:38,195 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:38,201 [ scc.git] DEBUG [detached HEAD 15755bb] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:38,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:38,201 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:38,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:38,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-31 01:51:38,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:39,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-31 01:51:39,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:39,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-31 01:51:39,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:40,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-31 01:51:40,054 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:40,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-31 01:51:40,054 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:40,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:40,056 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:40,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:40,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:40,062 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:40,065 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:40,065 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:40,065 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:40,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:40,067 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:40,105 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:40,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:40,107 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:40,144 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:40,148 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd524342590> has no local changes
2025-03-31 01:51:40,148 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:40,154 [ scc.git] DEBUG [detached HEAD 1571000] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:40,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:40,154 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:40,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:40,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-31 01:51:40,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:41,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-31 01:51:41,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:41,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-31 01:51:41,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:42,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-31 01:51:42,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:42,543 [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-31 01:51:42,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:43,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-31 01:51:43,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:43,533 [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-31 01:51:43,533 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-31 01:51:43,533 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:43,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-31 01:51:43,533 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:43,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:43,536 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:43,538 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:43,538 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:43,541 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:43,545 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:43,545 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-31 01:51:43,823 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-31 01:51:43,823 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-31 01:51:43,827 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:43,827 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:43,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:43,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-31 01:51:43,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:43,835 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-31 01:51:43,844 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG Auto-merging setup.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-31 01:51:43,844 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:51:43,844 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:51:43,847 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-31 01:51:43,851 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-31 01:51:43,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:44,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:44,026 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-31 01:51:44,029 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-31 01:51:44,032 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2025-03-31 01:51:44,034 [ scc.config] DEBUG Found github.token
2025-03-31 01:51:44,034 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-31 01:51:44,034 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:44,072 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:44,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:44,074 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:44,111 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:44,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd524363610> has no local changes
2025-03-31 01:51:44,114 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:44,120 [ scc.git] DEBUG [detached HEAD be51882] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:44,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:44,121 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:44,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:44,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-31 01:51:44,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:45,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-31 01:51:45,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:45,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-31 01:51:45,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:46,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-31 01:51:46,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:46,606 [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-31 01:51:46,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:47,074 [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-31 01:51:47,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:47,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-31 01:51:47,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:48,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-31 01:51:48,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:48,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-31 01:51:48,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:48,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-31 01:51:49,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:49,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-31 01:51:49,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:49,916 [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-31 01:51:50,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:50,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-31 01:51:50,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:50,863 [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-31 01:51:50,863 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-31 01:51:50,863 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:50,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-31 01:51:50,864 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:50,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:50,866 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:50,869 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:50,869 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:50,872 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:50,875 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:50,875 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-31 01:51:51,173 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-31 01:51:51,173 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-31 01:51:51,177 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:51,177 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:51,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:51,180 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-31 01:51:51,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:51,186 [ 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-31 01:51:51,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-31 01:51:51,203 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-31 01:51:51,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-31 01:51:51,204 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-31 01:51:51,204 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-31 01:51:51,204 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-31 01:51:51,204 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-31 01:51:51,204 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-31 01:51:51,205 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-31 01:51:51,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:51,664 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:51,704 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:51,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:51,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:51,744 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:51,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd524345550> has no local changes
2025-03-31 01:51:51,749 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:51,756 [ scc.git] DEBUG [detached HEAD fb05d37] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:51,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:51,756 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:51,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:52,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-31 01:51:52,088 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:52,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-31 01:51:52,089 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:52,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:52,091 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:52,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:52,093 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:52,096 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:52,099 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:52,099 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:52,099 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:52,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:52,101 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:52,139 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:52,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:52,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:52,179 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:52,183 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd524381050> has no local changes
2025-03-31 01:51:52,183 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:52,189 [ scc.git] DEBUG [detached HEAD 59cd7da] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:52,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:52,189 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:52,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:52,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-31 01:51:52,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:53,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-31 01:51:53,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:53,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-31 01:51:53,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:54,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-31 01:51:54,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:54,559 [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-31 01:51:54,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:55,064 [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-31 01:51:55,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:55,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-31 01:51:55,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:56,005 [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-31 01:51:56,005 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-31 01:51:56,005 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:51:56,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-31 01:51:56,006 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:56,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:56,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:51:56,011 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:51:56,011 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:51:56,013 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:51:56,016 [ scc.git] DEBUG Already up to date.
2025-03-31 01:51:56,017 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-31 01:51:56,336 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-31 01:51:56,336 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-31 01:51:56,340 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:51:56,340 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:56,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:56,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-31 01:51:56,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:56,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-31 01:51:56,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:51:56,358 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-31 01:51:56,358 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-31 01:51:56,358 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-31 01:51:56,358 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-31 01:51:56,358 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-31 01:51:56,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:56,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:51:56,524 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:51:56,562 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:51:56,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:51:56,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:51:56,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:51:56,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd525708a90> has no local changes
2025-03-31 01:51:56,605 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:51:56,611 [ scc.git] DEBUG [detached HEAD ba8b208] merge master -Dorg -Ssuccess-only
2025-03-31 01:51:56,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:51:56,611 [ scc.git] INFO Overriding base-branch from master to main
2025-03-31 01:51:56,611 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:51:56,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:57,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-31 01:51:57,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:57,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-31 01:51:57,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:58,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-31 01:51:58,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:58,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-31 01:51:58,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:59,117 [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-31 01:51:59,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:51:59,600 [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-31 01:51:59,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:00,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-31 01:52:00,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:00,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-31 01:52:00,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:01,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-31 01:52:01,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:01,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-31 01:52:01,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:02,020 [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-31 01:52:02,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:02,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-31 01:52:02,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:02,892 [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-31 01:52:02,892 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-31 01:52:02,892 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:52:02,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-31 01:52:02,892 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:02,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:02,895 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-31 01:52:02,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:52:02,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-31 01:52:02,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-31 01:52:02,903 [ scc.git] DEBUG Already up to date.
2025-03-31 01:52:02,903 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-31 01:52:03,198 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-31 01:52:03,198 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-31 01:52:03,202 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:52:03,202 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:03,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-31 01:52:03,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,210 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-31 01:52:03,218 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-31 01:52:03,218 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-31 01:52:03,218 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:52:03,218 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:52:03,221 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-31 01:52:03,225 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-31 01:52:03,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:03,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:03,380 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-31 01:52:03,383 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-31 01:52:03,386 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-31 01:52:03,389 [ scc.config] DEBUG Found github.token
2025-03-31 01:52:03,389 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-31 01:52:03,389 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:52:03,426 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:03,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,429 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:03,466 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:03,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd52435d690> has no local changes
2025-03-31 01:52:03,469 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:03,476 [ scc.git] DEBUG [detached HEAD 5ec2ee7] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:03,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:03,477 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:52:03,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:03,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-31 01:52:03,816 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:52:03,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-31 01:52:03,816 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:03,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:52:03,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:52:03,820 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:52:03,823 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:52:03,826 [ scc.git] DEBUG Already up to date.
2025-03-31 01:52:03,826 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:52:03,826 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:03,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,828 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:52:03,866 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:03,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:03,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:03,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:03,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd52570c110> has no local changes
2025-03-31 01:52:03,910 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:03,916 [ scc.git] DEBUG [detached HEAD 96ed020] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:03,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:03,917 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:52:04,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:04,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-31 01:52:04,282 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:52:04,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-31 01:52:04,282 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:04,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:04,285 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:52:04,287 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:52:04,287 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:52:04,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:52:04,293 [ scc.git] DEBUG Already up to date.
2025-03-31 01:52:04,293 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:52:04,293 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:04,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:04,295 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:52:04,333 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:04,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:04,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:04,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:04,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd52431c6d0> has no local changes
2025-03-31 01:52:04,379 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:04,385 [ scc.git] DEBUG [detached HEAD c181c87] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:04,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:04,385 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:52:04,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:04,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-31 01:52:05,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:05,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-31 01:52:05,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:05,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-31 01:52:06,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:06,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-31 01:52:06,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:06,771 [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-31 01:52:07,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:07,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-31 01:52:07,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:07,657 [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-31 01:52:07,657 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-31 01:52:07,657 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:52:07,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-31 01:52:07,657 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:07,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:07,660 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-31 01:52:07,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:52:07,663 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-31 01:52:07,666 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-31 01:52:07,669 [ scc.git] DEBUG Already up to date.
2025-03-31 01:52:07,669 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-31 01:52:07,945 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-31 01:52:07,945 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-31 01:52:07,949 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:52:07,949 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:07,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:07,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-31 01:52:07,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:07,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-31 01:52:07,965 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-31 01:52:07,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-31 01:52:07,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:52:07,966 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:52:07,969 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-31 01:52:07,974 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-31 01:52:07,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:08,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:08,139 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-31 01:52:08,141 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-31 01:52:08,144 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-31 01:52:08,146 [ scc.config] DEBUG Found github.token
2025-03-31 01:52:08,146 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-31 01:52:08,146 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:52:08,187 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:08,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:08,189 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:08,227 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:08,231 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5256caf90> has no local changes
2025-03-31 01:52:08,231 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:08,238 [ scc.git] DEBUG [detached HEAD 47e6abf] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:08,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:08,238 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-31 01:52:08,238 [ scc.repo] DEBUG ## PRs found:
2025-03-31 01:52:08,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:08,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-31 01:52:09,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:09,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-31 01:52:09,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:09,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-31 01:52:09,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:10,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-31 01:52:10,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:10,624 [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-31 01:52:10,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:11,096 [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-31 01:52:11,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:11,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-31 01:52:11,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:12,030 [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-31 01:52:12,030 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-31 01:52:12,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:12,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-31 01:52:12,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:12,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-31 01:52:13,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:13,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-31 01:52:13,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:13,871 [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-31 01:52:14,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:14,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-31 01:52:14,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:14,774 [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-31 01:52:14,774 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-31 01:52:15,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:15,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-31 01:52:15,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:15,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-31 01:52:16,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:16,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-31 01:52:16,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:16,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-31 01:52:16,871 [ scc.repo] DEBUG ## Branches found:
2025-03-31 01:52:16,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-31 01:52:16,871 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:16,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:16,874 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-31 01:52:16,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-31 01:52:16,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-31 01:52:16,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-31 01:52:16,888 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-31 01:52:17,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:17,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-31 01:52:17,676 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-31 01:52:17,989 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-31 01:52:17,989 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-31 01:52:17,993 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-31 01:52:18,276 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-31 01:52:18,276 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-31 01:52:18,281 [ scc.git] DEBUG ## Unique users: []
2025-03-31 01:52:18,281 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:18,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:18,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-31 01:52:18,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:18,291 [ 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-31 01:52:18,301 [ 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-31 01:52:18,302 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-31 01:52:18,302 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-31 01:52:18,304 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-31 01:52:18,308 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-31 01:52:18,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:18,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:18,483 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-31 01:52:18,488 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-31 01:52:18,492 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#373](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-31 01:52:18,494 [ scc.config] DEBUG Found github.token
2025-03-31 01:52:18,494 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-31 01:52:18,494 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-31 01:52:18,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:18,501 [ 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-31 01:52:18,510 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-31 01:52:18,513 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-31 01:52:18,513 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-31 01:52:18,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:18,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:18,896 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-31 01:52:18,938 [ scc.git] DEBUG Get sha1 of %s
2025-03-31 01:52:18,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-31 01:52:18,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:18,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:18,981 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5243b64d0> has no local changes
2025-03-31 01:52:18,982 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:18,989 [ scc.git] DEBUG [detached HEAD 3724745] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:18,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:18,989 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-31 01:52:19,069 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-31 01:52:19,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:19,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:19,311 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-31 01:52:19,313 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-31 01:52:19,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:19,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:19,739 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-31 01:52:19,741 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-31 01:52:19,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:20,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:20,156 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-31 01:52:20,158 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-31 01:52:20,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:20,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:20,566 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-31 01:52:20,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:20,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:20,991 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-31 01:52:20,993 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-31 01:52:21,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:21,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:21,476 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-31 01:52:21,478 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-31 01:52:21,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:21,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:21,889 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-31 01:52:21,891 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-31 01:52:22,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:22,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:22,311 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-31 01:52:22,312 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-31 01:52:22,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:22,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:22,735 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-31 01:52:22,737 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-31 01:52:22,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:23,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:23,172 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-31 01:52:23,174 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-31 01:52:23,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:23,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:23,616 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-31 01:52:23,617 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-31 01:52:23,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:24,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:24,030 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-31 01:52:24,032 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-31 01:52:24,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:24,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:24,467 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-31 01:52:24,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:24,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:24,884 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-31 01:52:25,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:25,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:25,307 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-31 01:52:25,309 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-31 01:52:25,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:25,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:25,720 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-31 01:52:25,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:26,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:26,131 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-31 01:52:26,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:26,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:26,578 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-31 01:52:26,580 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-31 01:52:26,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:26,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:26,985 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-31 01:52:26,987 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-31 01:52:27,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:27,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:27,405 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-31 01:52:27,407 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-31 01:52:27,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:27,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:27,813 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-31 01:52:27,815 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-31 01:52:28,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-31 01:52:28,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-31 01:52:28,226 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-31 01:52:28,226 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-31 01:52:28,315 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd526130610> has local changes
2025-03-31 01:52:28,315 [ 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#373 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/373/)'
2025-03-31 01:52:28,328 [ scc.git] DEBUG [detached HEAD 6db0e34] merge master -Dorg -Ssuccess-only
2025-03-31 01:52:28,328 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-31 01:52:28,328 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-31 01:52:28,329 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-31 01:52:28,329 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-31 01:52:28,329 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-31 01:52:28,329 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-31 01:52:28,329 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-31 01:52:28,329 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-31 01:52:28,329 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-31 01:52:28,329 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,329 [ scc.merge] INFO
2025-03-31 01:52:28,329 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-31 01:52:28,329 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-31 01:52:28,330 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-31 01:52:28,330 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-31 01:52:28,330 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-31 01:52:28,330 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-31 01:52:28,330 [ scc.merge] INFO
2025-03-31 01:52:28,330 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-31 01:52:28,330 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-31 01:52:28,331 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-03-31 01:52:28,331 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-31 01:52:28,331 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-31 01:52:28,331 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-31 01:52:28,331 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-31 01:52:28,331 [ scc.merge] INFO
2025-03-31 01:52:28,331 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-31 01:52:28,331 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-31 01:52:28,331 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-31 01:52:28,332 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-31 01:52:28,332 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,332 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO
2025-03-31 01:52:28,332 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-31 01:52:28,332 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-31 01:52:28,333 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-31 01:52:28,333 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-31 01:52:28,333 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-31 01:52:28,333 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-31 01:52:28,333 [ scc.merge] INFO Already up to date.
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Repository: ome/scripts
2025-03-31 01:52:28,333 [ scc.merge] INFO Excluded PRs:
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-31 01:52:28,333 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-31 01:52:28,333 [ scc.merge] INFO Previously merged:
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Merged PRs:
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,333 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-31 01:52:28,333 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-31 01:52:28,333 [ scc.merge] INFO
2025-03-31 01:52:28,334 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-31 01:52:28,334 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-31 01:52:28,336 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-31 01:52:28,338 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-31 01:52:28,340 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-31 01:52:28,342 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-31 01:52:28,345 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-31 01:52:28,347 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-31 01:52:28,349 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-31 01:52:28,351 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-31 01:52:28,353 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-31 01:52:28,356 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-31 01:52:28,358 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-31 01:52:28,360 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-31 01:52:28,363 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-31 01:52:28,365 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-31 01:52:28,367 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-31 01:52:28,369 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-31 01:52:28,371 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-31 01:52:28,374 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-31 01:52:28,376 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-31 01:52:28,378 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-31 01:52:28,380 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-31 01:52:28,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-31 01:52:28,383 [ scc.git] DEBUG Calling 'git remote'
2025-03-31 01:52:28,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: 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.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: 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.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: 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.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: 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.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 5d329e7] 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 a4a4540] 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-31 01:53:15,811 [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-31 01:53:25,213 [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-31 01:53:27,745 [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-31 01:53:32,617 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-31 01:54:15,011 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS