Skipping 182 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
- PR #118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- package-lock.json
--conflicts
2025-02-26 00:45:04,176 [ scc.config] DEBUG Found github.token
2025-02-26 00:45:04,176 [ scc.git] DEBUG Adding comment to issue #119.
2025-02-26 00:45:04,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:04,978 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/119/comments HTTP/1.1" 201 2487
2025-02-26 00:45:04,979 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:05,019 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:05,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:05,025 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:05,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:05,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc70455ec40> has no local changes
2025-02-26 00:45:05,072 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 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'
Generated by OMERO-plugins-push#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:05,080 [ scc.git] DEBUG [detached HEAD 4278f99] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:05,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:05,081 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:05,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:05,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-26 00:45:05,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:06,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-02-26 00:45:06,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:06,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-02-26 00:45:06,560 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-26 00:45:06,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:07,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-26 00:45:07,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:07,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-26 00:45:08,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:08,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-26 00:45:08,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:08,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-26 00:45:09,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:09,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:09,383 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-26 00:45:09,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:09,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-26 00:45:09,874 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-26 00:45:10,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:10,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-26 00:45:10,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:10,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-26 00:45:11,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:11,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-26 00:45:11,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:12,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-26 00:45:12,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:12,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:12,547 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-26 00:45:12,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:13,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-26 00:45:13,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:13,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-26 00:45:13,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:13,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-26 00:45:14,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:14,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-26 00:45:14,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:15,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-26 00:45:15,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:15,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-26 00:45:15,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:16,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-26 00:45:16,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:16,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-26 00:45:16,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:16,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:16,898 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-26 00:45:17,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:17,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-26 00:45:17,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:17,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-26 00:45:18,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:18,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-26 00:45:18,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:18,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-26 00:45:19,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:19,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-26 00:45:19,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:19,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-26 00:45:20,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:20,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:20,333 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-26 00:45:20,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:20,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-26 00:45:21,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:21,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-26 00:45:21,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:21,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-26 00:45:22,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:22,298 [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-02-26 00:45:22,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:22,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-26 00:45:22,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:23,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:23,162 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-26 00:45:23,163 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:23,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-26 00:45:23,164 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:23,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:23,171 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:23,176 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:23,176 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:23,182 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:23,189 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:23,189 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-26 00:45:25,060 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-26 00:45:25,060 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-26 00:45:25,066 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-26 00:45:26,800 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-26 00:45:26,800 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-26 00:45:26,806 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-26 00:45:27,192 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-26 00:45:27,193 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-26 00:45:27,200 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-26 00:45:27,504 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-26 00:45:27,504 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-26 00:45:27,511 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-02-26 00:45:27,799 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-26 00:45:27,799 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-02-26 00:45:27,804 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:27,804 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:27,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:27,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-26 00:45:27,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:27,828 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-26 00:45:27,868 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-26 00:45:27,868 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-26 00:45:27,868 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:27,872 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-26 00:45:27,872 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-26 00:45:27,872 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-26 00:45:27,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:28,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:28,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-26 00:45:28,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:28,074 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-26 00:45:28,169 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-26 00:45:28,169 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-26 00:45:28,170 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-26 00:45:28,170 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-26 00:45:28,170 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:28,175 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-26 00:45:28,175 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-26 00:45:28,175 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-26 00:45:28,175 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-26 00:45:28,175 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-26 00:45:28,175 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-26 00:45:28,175 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-26 00:45:28,175 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-26 00:45:28,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:28,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:28,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-26 00:45:28,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:28,508 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-26 00:45:28,588 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-26 00:45:28,589 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:28,592 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-26 00:45:28,592 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-26 00:45:28,592 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-26 00:45:28,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:28,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:28,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-26 00:45:28,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:28,966 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-26 00:45:28,983 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:28,993 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-26 00:45:28,994 [ scc.git] DEBUG package.json | 2 +-
2025-02-26 00:45:28,994 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-26 00:45:29,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:29,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:29,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-26 00:45:29,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:29,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-26 00:45:29,521 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-26 00:45:29,521 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-26 00:45:29,521 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:45:29,521 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:45:29,528 [ scc.git] DEBUG Calling 'git reset --hard 7d461795bfe06881690d9b08b600fbaf2e0459b2'
2025-02-26 00:45:29,538 [ scc.git] DEBUG HEAD is now at 7d46179 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-02-26 00:45:29,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:29,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:29,730 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-26 00:45:29,737 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-02-26 00:45:29,744 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-02-26 00:45:29,749 [ scc.config] DEBUG Found github.token
2025-02-26 00:45:29,749 [ scc.git] DEBUG Adding comment to issue #502.
2025-02-26 00:45:29,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:30,507 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 201 2017
2025-02-26 00:45:30,509 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:30,557 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:30,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:30,563 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:30,602 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:30,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044d8520> has no local changes
2025-02-26 00:45:30,613 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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)
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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:30,623 [ scc.git] DEBUG [detached HEAD e2be6fc] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:30,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:30,624 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:30,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:30,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-26 00:45:31,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:31,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-26 00:45:31,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:32,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-26 00:45:32,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:32,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-26 00:45:32,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:33,127 [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-02-26 00:45:33,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:33,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-26 00:45:33,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:34,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:34,022 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-26 00:45:34,022 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:34,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-26 00:45:34,022 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:34,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:34,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:34,034 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:34,034 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:34,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:34,047 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:34,047 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-26 00:45:35,295 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-26 00:45:35,295 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-26 00:45:35,301 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:35,301 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:35,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:35,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-26 00:45:35,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:35,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-26 00:45:35,334 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:35,337 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-26 00:45:35,337 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-26 00:45:35,337 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-26 00:45:35,337 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-26 00:45:35,337 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-26 00:45:35,337 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-26 00:45:35,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:35,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:35,502 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:35,542 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:35,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:35,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:35,595 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:35,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc704565e20> has no local changes
2025-02-26 00:45:35,603 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:35,613 [ scc.git] DEBUG [detached HEAD ac16ec2] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:35,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:35,614 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:35,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:36,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-26 00:45:36,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:36,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-26 00:45:36,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:37,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-26 00:45:37,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:37,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-26 00:45:37,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:38,167 [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-02-26 00:45:38,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:39,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-26 00:45:39,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:39,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:39,508 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-26 00:45:39,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:40,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-26 00:45:40,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:40,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-26 00:45:40,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:40,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-26 00:45:41,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:41,475 [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-02-26 00:45:41,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:41,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-26 00:45:42,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:42,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:42,535 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-26 00:45:42,535 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:42,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-26 00:45:42,536 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:42,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:42,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:42,556 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:42,557 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:42,566 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:42,576 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:42,577 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-26 00:45:43,429 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-26 00:45:43,429 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-26 00:45:43,436 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-26 00:45:44,012 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-26 00:45:44,012 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-26 00:45:44,017 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:44,017 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:44,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:44,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-26 00:45:44,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:44,040 [ 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-02-26 00:45:44,144 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-26 00:45:44,145 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-26 00:45:44,145 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-26 00:45:44,145 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-26 00:45:44,145 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:45:44,146 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:45:44,153 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-26 00:45:44,161 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-26 00:45:44,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:44,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:44,342 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-26 00:45:44,350 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-26 00:45:44,357 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-02-26 00:45:44,365 [ scc.config] DEBUG Found github.token
2025-02-26 00:45:44,365 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-26 00:45:44,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-26 00:45:44,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:44,381 [ 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-02-26 00:45:44,672 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-26 00:45:44,672 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-26 00:45:44,672 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-26 00:45:44,672 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:45:44,673 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:45:44,681 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-26 00:45:44,693 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-26 00:45:44,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:44,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:44,857 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-26 00:45:44,865 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-26 00:45:44,884 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/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-02-26 00:45:44,898 [ scc.config] DEBUG Found github.token
2025-02-26 00:45:44,899 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-26 00:45:44,900 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:44,954 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:44,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:44,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:45,007 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:45,015 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044c2250> has no local changes
2025-02-26 00:45:45,015 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:45,024 [ scc.git] DEBUG [detached HEAD 0585384] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:45,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:45,025 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:45,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:45,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-26 00:45:45,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:46,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-26 00:45:46,194 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-26 00:45:46,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:46,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-26 00:45:47,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:47,382 [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-02-26 00:45:47,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:47,926 [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-02-26 00:45:48,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:48,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-26 00:45:48,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:48,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:48,908 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-26 00:45:49,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:49,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-26 00:45:49,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:49,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-26 00:45:50,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:50,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-26 00:45:50,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:50,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-26 00:45:51,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:51,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-26 00:45:51,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:51,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-26 00:45:52,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:52,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-26 00:45:52,490 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:52,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-26 00:45:52,490 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:52,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:52,497 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:52,502 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:52,503 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:52,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:52,517 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:52,517 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-26 00:45:52,819 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-26 00:45:52,819 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-26 00:45:52,823 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:52,823 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:52,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:52,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-26 00:45:52,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:52,843 [ 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-02-26 00:45:52,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:45:52,857 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-26 00:45:52,857 [ scc.git] DEBUG package.json | 2 +-
2025-02-26 00:45:52,857 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-26 00:45:52,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:53,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:53,017 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:53,061 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:53,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:53,068 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:53,112 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:53,121 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc70451ff10> has no local changes
2025-02-26 00:45:53,121 [ 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'
Generated by OMERO-plugins-push#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:53,132 [ scc.git] DEBUG [detached HEAD ee74bb5] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:53,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:53,133 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:53,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:53,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-26 00:45:53,456 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:53,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-26 00:45:53,456 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:53,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:53,462 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:53,467 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:53,468 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:53,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:53,483 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:53,484 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:53,484 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:53,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:53,491 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:53,537 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:53,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:53,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:53,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:53,594 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044fb8e0> has no local changes
2025-02-26 00:45:53,594 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:53,604 [ scc.git] DEBUG [detached HEAD 6ddb173] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:53,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:53,604 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:53,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:53,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-26 00:45:54,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:54,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-26 00:45:54,458 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:54,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-26 00:45:54,458 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:54,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:54,465 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:54,470 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:54,471 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:54,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:54,482 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:54,483 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:54,483 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:54,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:54,487 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:54,527 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:54,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:54,533 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:54,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:54,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044cb160> has no local changes
2025-02-26 00:45:54,583 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:54,594 [ scc.git] DEBUG [detached HEAD cc4aaa7] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:54,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:54,595 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:54,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:55,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-26 00:45:55,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:55,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-26 00:45:55,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:55,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-26 00:45:56,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:56,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-26 00:45:56,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:57,064 [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-02-26 00:45:57,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:57,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-26 00:45:57,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:58,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:45:58,039 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-26 00:45:58,039 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:45:58,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-26 00:45:58,039 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:58,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:58,046 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:45:58,052 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:45:58,052 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:45:58,059 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:45:58,066 [ scc.git] DEBUG Already up to date.
2025-02-26 00:45:58,067 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-26 00:45:58,440 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-26 00:45:58,441 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-26 00:45:58,446 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:45:58,446 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:58,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:58,452 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-26 00:45:58,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:58,464 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-26 00:45:58,617 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:45:58,618 [ scc.git] DEBUG Auto-merging setup.py
2025-02-26 00:45:58,618 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-26 00:45:58,621 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:45:58,625 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-26 00:45:58,632 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-26 00:45:58,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:58,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:45:58,793 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-26 00:45:58,800 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-26 00:45:58,806 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-02-26 00:45:58,811 [ scc.config] DEBUG Found github.token
2025-02-26 00:45:58,812 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-26 00:45:58,812 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:45:58,856 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:45:58,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:45:58,862 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:45:58,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:45:58,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044b6dc0> has no local changes
2025-02-26 00:45:58,914 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:45:58,924 [ scc.git] DEBUG [detached HEAD 997ed76] merge master -Dorg -Ssuccess-only
2025-02-26 00:45:58,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:45:58,924 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:45:59,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:59,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-26 00:45:59,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:45:59,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-26 00:46:00,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:00,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-26 00:46:00,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:00,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-26 00:46:01,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:01,458 [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-02-26 00:46:01,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:01,940 [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-02-26 00:46:02,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:02,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-26 00:46:02,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:02,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-26 00:46:03,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:03,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-26 00:46:03,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:03,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-26 00:46:04,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:04,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-26 00:46:04,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:04,879 [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-02-26 00:46:05,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:05,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-26 00:46:05,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:05,857 [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-02-26 00:46:05,858 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-26 00:46:05,858 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:05,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-26 00:46:05,859 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:05,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:05,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:05,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:05,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:05,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:05,883 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:05,883 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-26 00:46:06,246 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-26 00:46:06,246 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-26 00:46:06,251 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:06,251 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:06,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-26 00:46:06,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,269 [ 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-02-26 00:46:06,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:46:06,292 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-26 00:46:06,293 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-26 00:46:06,294 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-26 00:46:06,294 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-26 00:46:06,294 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-26 00:46:06,294 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-26 00:46:06,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-26 00:46:06,296 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-26 00:46:06,296 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-26 00:46:06,296 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-26 00:46:06,296 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-26 00:46:06,296 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-26 00:46:06,296 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-26 00:46:06,296 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-26 00:46:06,297 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-26 00:46:06,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:06,454 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:06,497 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:06,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,502 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:06,544 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:06,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044e0ac0> has no local changes
2025-02-26 00:46:06,552 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:06,562 [ scc.git] DEBUG [detached HEAD 2568382] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:06,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:06,562 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:06,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:06,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-26 00:46:06,922 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:06,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-26 00:46:06,923 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:06,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:06,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:06,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:06,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:06,947 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:06,947 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:06,947 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:06,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,952 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:06,993 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:06,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:06,999 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:07,039 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:07,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044b5160> has no local changes
2025-02-26 00:46:07,046 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:07,054 [ scc.git] DEBUG [detached HEAD 02862a2] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:07,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:07,054 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:07,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:07,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-26 00:46:07,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:07,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-26 00:46:08,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:08,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-26 00:46:08,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:08,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-26 00:46:09,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:09,436 [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-02-26 00:46:09,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:09,910 [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-02-26 00:46:10,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:10,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-26 00:46:10,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:10,929 [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-02-26 00:46:10,931 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-26 00:46:10,931 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:10,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-26 00:46:10,931 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:10,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:10,937 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:10,943 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:10,944 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:10,950 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:10,956 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:10,957 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-26 00:46:11,601 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-26 00:46:11,601 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-26 00:46:11,606 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:11,606 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:11,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:11,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-26 00:46:11,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:11,623 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-26 00:46:11,634 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:46:11,636 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-26 00:46:11,636 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-26 00:46:11,637 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-26 00:46:11,637 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-26 00:46:11,637 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-26 00:46:11,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:11,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:11,800 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:11,843 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:11,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:11,849 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:11,895 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:11,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7044e0fa0> has no local changes
2025-02-26 00:46:11,903 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:11,912 [ scc.git] DEBUG [detached HEAD 27a7f84] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:11,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:11,913 [ scc.git] INFO Overriding base-branch from master to main
2025-02-26 00:46:11,913 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:12,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:12,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-26 00:46:12,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:12,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-26 00:46:13,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:13,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-26 00:46:13,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:13,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-26 00:46:14,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:14,366 [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-02-26 00:46:14,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:14,879 [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-02-26 00:46:15,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:15,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-26 00:46:15,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:15,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-26 00:46:16,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:16,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-26 00:46:16,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:16,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-26 00:46:17,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:17,338 [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-02-26 00:46:17,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:17,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-26 00:46:18,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:18,256 [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-02-26 00:46:18,257 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-26 00:46:18,257 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:18,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-26 00:46:18,257 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:18,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:18,263 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-26 00:46:18,268 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:18,269 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-26 00:46:18,274 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-26 00:46:18,281 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:18,281 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-26 00:46:18,734 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-26 00:46:18,734 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-26 00:46:18,739 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:18,739 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:18,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:18,746 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-26 00:46:18,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:18,758 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-26 00:46:18,777 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-26 00:46:18,777 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-26 00:46:18,777 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:46:18,778 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:46:18,784 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-26 00:46:18,790 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-26 00:46:18,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:18,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:18,962 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-26 00:46:18,968 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-26 00:46:18,975 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-26 00:46:18,980 [ scc.config] DEBUG Found github.token
2025-02-26 00:46:18,980 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-26 00:46:18,980 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:19,023 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,028 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:19,070 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:19,077 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc704486190> has no local changes
2025-02-26 00:46:19,077 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:19,087 [ scc.git] DEBUG [detached HEAD 015acc7] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:19,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:19,087 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:19,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:19,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-26 00:46:19,396 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:19,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-26 00:46:19,396 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,402 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:19,407 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:19,408 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:19,414 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:19,420 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:19,420 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:19,420 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,425 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:19,473 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,480 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:19,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:19,527 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7043ba5b0> has no local changes
2025-02-26 00:46:19,527 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:19,535 [ scc.git] DEBUG [detached HEAD 941daf8] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:19,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:19,536 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:19,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:19,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-26 00:46:19,869 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:19,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-26 00:46:19,869 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,876 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:19,881 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:19,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:19,886 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:19,892 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:19,892 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:19,892 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,897 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:19,937 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:19,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:19,944 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:19,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:19,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc704486dc0> has no local changes
2025-02-26 00:46:19,991 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:20,000 [ scc.git] DEBUG [detached HEAD 3d0f3ff] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:20,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:20,001 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:20,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:20,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-26 00:46:20,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:20,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-26 00:46:21,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:21,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-26 00:46:21,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:21,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-26 00:46:22,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:22,432 [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-02-26 00:46:22,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:22,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-26 00:46:23,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:23,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:46:23,318 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-26 00:46:23,319 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:23,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-26 00:46:23,319 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:23,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:23,326 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-26 00:46:23,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:23,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-26 00:46:23,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-26 00:46:23,343 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:23,344 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-26 00:46:23,810 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-26 00:46:23,810 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-26 00:46:23,815 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:23,815 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:23,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:23,821 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-26 00:46:23,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:23,833 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-26 00:46:23,878 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-26 00:46:23,878 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-26 00:46:23,878 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:46:23,878 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:46:23,885 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-26 00:46:23,893 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-26 00:46:23,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:24,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:24,087 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-26 00:46:24,093 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-26 00:46:24,100 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-26 00:46:24,107 [ scc.config] DEBUG Found github.token
2025-02-26 00:46:24,107 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-26 00:46:24,107 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:24,150 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:24,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:24,156 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:24,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:24,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7043ba610> has no local changes
2025-02-26 00:46:24,219 [ 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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:24,229 [ scc.git] DEBUG [detached HEAD 0361623] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:24,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:24,229 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-26 00:46:24,229 [ scc.repo] DEBUG ## PRs found:
2025-02-26 00:46:24,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:24,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-26 00:46:24,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:25,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-26 00:46:25,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:25,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-26 00:46:25,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:26,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-26 00:46:26,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:26,612 [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-02-26 00:46:26,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:27,083 [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-02-26 00:46:27,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:27,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-26 00:46:27,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:27,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:46:27,960 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-26 00:46:28,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:28,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-26 00:46:28,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:28,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-26 00:46:29,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:29,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-26 00:46:29,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:29,917 [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-02-26 00:46:30,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:30,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-26 00:46:30,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:30,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-02-26 00:46:30,896 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-26 00:46:31,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:31,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-26 00:46:31,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:31,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-26 00:46:32,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:32,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-26 00:46:32,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:32,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-26 00:46:32,862 [ scc.repo] DEBUG ## Branches found:
2025-02-26 00:46:32,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-26 00:46:32,862 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:32,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:32,869 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-26 00:46:32,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-26 00:46:32,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-26 00:46:32,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-26 00:46:32,888 [ scc.git] DEBUG Already up to date.
2025-02-26 00:46:32,888 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-26 00:46:33,717 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-26 00:46:33,717 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-26 00:46:33,722 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-26 00:46:34,319 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-26 00:46:34,319 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-26 00:46:34,324 [ scc.git] DEBUG ## Unique users: []
2025-02-26 00:46:34,324 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:34,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:34,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-26 00:46:34,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:34,345 [ 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-02-26 00:46:34,425 [ 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-02-26 00:46:34,425 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-26 00:46:34,425 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-26 00:46:34,431 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-26 00:46:34,439 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-26 00:46:34,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:34,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:34,608 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-26 00:46:34,617 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-26 00:46:34,623 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#345](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-26 00:46:34,629 [ scc.config] DEBUG Found github.token
2025-02-26 00:46:34,629 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-26 00:46:34,629 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-26 00:46:34,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:34,644 [ 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-02-26 00:46:34,657 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-26 00:46:34,661 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-26 00:46:34,661 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-26 00:46:34,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:35,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:35,025 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-26 00:46:35,075 [ scc.git] DEBUG Get sha1 of %s
2025-02-26 00:46:35,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-26 00:46:35,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:35,124 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:35,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7043fa0d0> has no local changes
2025-02-26 00:46:35,131 [ 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)
Already up to date.
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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:35,140 [ scc.git] DEBUG [detached HEAD 20525ef] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:35,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:35,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-26 00:46:35,218 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-26 00:46:35,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:35,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:35,450 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-26 00:46:35,455 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-26 00:46:35,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:35,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:35,869 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-26 00:46:35,874 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-26 00:46:36,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:36,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:36,279 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-26 00:46:36,284 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-26 00:46:36,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:36,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:36,707 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-26 00:46:36,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:37,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:37,104 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-26 00:46:37,110 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-26 00:46:37,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:37,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:37,511 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-26 00:46:37,516 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-26 00:46:37,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:37,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:37,934 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-26 00:46:37,939 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-26 00:46:38,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:38,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:38,365 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-26 00:46:38,372 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-26 00:46:38,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:38,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:38,807 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-26 00:46:38,813 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-26 00:46:39,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:39,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:39,218 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-26 00:46:39,225 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-26 00:46:39,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:39,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:39,660 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-26 00:46:39,666 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-26 00:46:39,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:40,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:40,079 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-26 00:46:40,085 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-26 00:46:40,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:40,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:40,502 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-26 00:46:40,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:40,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:40,925 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-26 00:46:41,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:41,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:41,341 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-26 00:46:41,347 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-26 00:46:41,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:41,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:41,766 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-26 00:46:41,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:42,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:42,197 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-26 00:46:42,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:42,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:42,601 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-26 00:46:42,606 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-26 00:46:42,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:43,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:43,022 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-26 00:46:43,028 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-26 00:46:43,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:43,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:43,464 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-26 00:46:43,469 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-26 00:46:43,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:43,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:43,884 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-26 00:46:43,890 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-26 00:46:44,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-26 00:46:44,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-26 00:46:44,306 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-26 00:46:44,309 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-26 00:46:44,406 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc7072cbf10> has local changes
2025-02-26 00:46:44,406 [ 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 167 dominikl 'Add extinfo command' (stage: draft)
- 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'
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 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- 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'
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 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)
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'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- 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)
Already up to date.
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#345 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/345/)'
2025-02-26 00:46:44,421 [ scc.git] DEBUG [detached HEAD 109798a] merge master -Dorg -Ssuccess-only
2025-02-26 00:46:44,422 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-26 00:46:44,422 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-26 00:46:44,422 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-26 00:46:44,422 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-26 00:46:44,422 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-26 00:46:44,422 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-26 00:46:44,422 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-26 00:46:44,422 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,422 [ scc.merge] INFO
2025-02-26 00:46:44,422 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-26 00:46:44,422 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-26 00:46:44,423 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-26 00:46:44,423 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-26 00:46:44,423 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-26 00:46:44,423 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-26 00:46:44,423 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,423 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-26 00:46:44,423 [ scc.merge] INFO
2025-02-26 00:46:44,423 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-26 00:46:44,423 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-26 00:46:44,424 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-26 00:46:44,424 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-26 00:46:44,424 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-26 00:46:44,424 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,424 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,424 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-26 00:46:44,424 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,424 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-26 00:46:44,425 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-26 00:46:44,425 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-26 00:46:44,425 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-26 00:46:44,425 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-26 00:46:44,425 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-26 00:46:44,425 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-26 00:46:44,425 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-26 00:46:44,425 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-26 00:46:44,425 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,425 [ scc.merge] INFO
2025-02-26 00:46:44,425 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-26 00:46:44,426 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-26 00:46:44,426 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-26 00:46:44,426 [ scc.merge] INFO
2025-02-26 00:46:44,426 [ scc.merge] INFO Repository: ome/scripts
2025-02-26 00:46:44,426 [ scc.merge] INFO Excluded PRs:
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-26 00:46:44,426 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-26 00:46:44,427 [ scc.merge] INFO Already up to date.
2025-02-26 00:46:44,427 [ scc.merge] INFO
2025-02-26 00:46:44,427 [ scc.merge] INFO Merged PRs:
2025-02-26 00:46:44,427 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-26 00:46:44,427 [ scc.merge] INFO
2025-02-26 00:46:44,427 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-26 00:46:44,427 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-26 00:46:44,427 [ scc.merge] INFO
2025-02-26 00:46:44,427 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-26 00:46:44,427 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-26 00:46:44,433 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-26 00:46:44,439 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-26 00:46:44,445 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-26 00:46:44,453 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-26 00:46:44,466 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-26 00:46:44,474 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-26 00:46:44,481 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-26 00:46:44,487 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-26 00:46:44,493 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-26 00:46:44,499 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-26 00:46:44,506 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-26 00:46:44,513 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-26 00:46:44,520 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-26 00:46:44,526 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-26 00:46:44,533 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-26 00:46:44,539 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-26 00:46:44,545 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-26 00:46:44,551 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-26 00:46:44,557 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-26 00:46:44,563 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-26 00:46:44,568 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-26 00:46:44,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-26 00:46:44,574 [ scc.git] DEBUG Calling 'git remote'
2025-02-26 00:46:44,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-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 743c1f2] 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 9910fa2] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-02-26 00:47:31,901 [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-02-26 00:47:41,535 [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-02-26 00:47:44,063 [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-02-26 00:47:48,940 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-26 00:48:29,655 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
