Skipping 176 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-02-18 00:45:24,141 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-18 00:45:24,142 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:24,147 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-02-18 00:45:24,147 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-02-18 00:45:24,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:24,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:24,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-18 00:45:24,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:24,340 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-18 00:45:24,463 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-18 00:45:24,463 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-18 00:45:24,463 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:45:24,464 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:45:24,470 [ scc.git] DEBUG Calling 'git reset --hard 15d2fb82885825dae918df7cfd47d7fe943d49b6'
2025-02-18 00:45:24,477 [ scc.git] DEBUG HEAD is now at 15d2fb8 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-02-18 00:45:24,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:24,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:24,745 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-18 00:45:24,752 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-02-18 00:45:24,758 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-02-18 00:45:24,763 [ scc.config] DEBUG Found github.token
2025-02-18 00:45:24,763 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-02-18 00:45:24,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-02-18 00:45:24,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:24,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Bump serialize-javascript and webpack) 00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-02-18 00:45:24,972 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-18 00:45:24,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-18 00:45:24,973 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:45:24,973 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:45:24,979 [ scc.git] DEBUG Calling 'git reset --hard 15d2fb82885825dae918df7cfd47d7fe943d49b6'
2025-02-18 00:45:24,988 [ scc.git] DEBUG HEAD is now at 15d2fb8 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-02-18 00:45:24,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:25,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:25,173 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-02-18 00:45:25,181 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-02-18 00:45:25,188 [ scc.git] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- 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-18 00:45:25,193 [ scc.config] DEBUG Found github.token
2025-02-18 00:45:25,194 [ scc.git] DEBUG Adding comment to issue #119.
2025-02-18 00:45:25,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:25,988 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/119/comments HTTP/1.1" 201 2487
2025-02-18 00:45:25,989 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:45:26,030 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:26,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:26,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:45:26,078 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:45:26,087 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f7585220> has no local changes
2025-02-18 00:45:26,087 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:45:26,096 [ scc.git] DEBUG [detached HEAD b6f783e] merge master -Dorg -Ssuccess-only
2025-02-18 00:45:26,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:45:26,097 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:45:26,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:26,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-18 00:45:26,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:27,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-18 00:45:27,038 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-18 00:45:27,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:27,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-18 00:45:27,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:28,279 [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-18 00:45:28,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:28,804 [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-18 00:45:29,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:29,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-18 00:45:29,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:29,832 [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-18 00:45:29,833 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-18 00:45:30,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:30,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-18 00:45:30,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:30,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-18 00:45:31,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:31,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-18 00:45:31,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:31,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-18 00:45:31,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:32,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-18 00:45:32,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:32,881 [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-18 00:45:33,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:33,360 [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-18 00:45:33,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:33,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-18 00:45:34,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:34,337 [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-18 00:45:34,338 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-18 00:45:34,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:34,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-18 00:45:35,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:35,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-18 00:45:35,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:35,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-18 00:45:36,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:36,384 [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-18 00:45:36,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:36,904 [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-18 00:45:37,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:37,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-18 00:45:37,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:37,924 [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-18 00:45:37,925 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-18 00:45:38,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:38,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-18 00:45:38,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:38,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-18 00:45:39,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:39,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-18 00:45:39,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:39,984 [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-18 00:45:40,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:40,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-18 00:45:40,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:40,903 [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-18 00:45:40,904 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-18 00:45:40,905 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:45:40,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-18 00:45:40,905 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:40,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:40,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:45:40,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:45:40,920 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:45:40,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:45:40,935 [ scc.git] DEBUG Already up to date.
2025-02-18 00:45:40,936 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-18 00:45:41,250 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-18 00:45:41,250 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-18 00:45:41,255 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-18 00:45:43,461 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-18 00:45:43,461 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-18 00:45:43,471 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-18 00:45:43,844 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-18 00:45:43,844 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-18 00:45:43,853 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-18 00:45:44,131 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-18 00:45:44,132 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-18 00:45:44,136 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:45:44,136 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:44,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:44,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-18 00:45:44,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:44,158 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-18 00:45:44,174 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-18 00:45:44,174 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-18 00:45:44,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:44,237 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-18 00:45:44,237 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-18 00:45:44,237 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-18 00:45:44,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:44,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:44,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-18 00:45:44,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:44,432 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-18 00:45:44,857 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-18 00:45:44,857 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-18 00:45:44,857 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-18 00:45:44,857 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-18 00:45:44,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:44,862 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-18 00:45:44,862 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-18 00:45:44,862 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-18 00:45:44,862 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-18 00:45:44,862 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-18 00:45:44,863 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-18 00:45:44,863 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-18 00:45:44,863 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-18 00:45:44,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:45,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:45,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-18 00:45:45,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:45,053 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-18 00:45:45,330 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-18 00:45:45,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:45,391 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-18 00:45:45,391 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-18 00:45:45,391 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-18 00:45:45,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:45,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:45,595 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-18 00:45:45,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:45,664 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-18 00:45:45,710 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:45,725 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-18 00:45:45,725 [ scc.git] DEBUG package.json | 2 +-
2025-02-18 00:45:45,725 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-18 00:45:45,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:46,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:46,017 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:45:46,070 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:46,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:46,079 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:45:46,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:45:46,134 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f5d12e20> has no local changes
2025-02-18 00:45:46,134 [ 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'
Generated by OMERO-plugins-push#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:45:46,180 [ scc.git] DEBUG [detached HEAD d08914d] merge master -Dorg -Ssuccess-only
2025-02-18 00:45:46,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:45:46,181 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:45:46,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:46,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-18 00:45:46,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:46,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-18 00:45:47,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:47,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-18 00:45:47,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:48,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-18 00:45:48,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:48,552 [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-18 00:45:48,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:49,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-18 00:45:49,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:49,434 [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-18 00:45:49,435 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-18 00:45:49,436 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:45:49,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-18 00:45:49,436 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:49,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:49,443 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:45:49,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:45:49,449 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:45:49,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:45:49,460 [ scc.git] DEBUG Already up to date.
2025-02-18 00:45:49,461 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-18 00:45:50,469 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-18 00:45:50,469 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-18 00:45:50,475 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:45:50,475 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:50,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:50,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-18 00:45:50,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:50,495 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-18 00:45:50,570 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:45:50,574 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-18 00:45:50,574 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-18 00:45:50,574 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-18 00:45:50,574 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-18 00:45:50,574 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-18 00:45:50,574 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-18 00:45:50,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:50,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:50,739 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:45:50,786 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:50,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:50,792 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:45:50,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:45:50,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f757c1f0> has no local changes
2025-02-18 00:45:50,846 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:45:50,856 [ scc.git] DEBUG [detached HEAD d43ee4f] merge master -Dorg -Ssuccess-only
2025-02-18 00:45:50,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:45:50,856 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:45:50,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:51,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-18 00:45:51,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:51,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-18 00:45:52,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:52,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-18 00:45:52,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:52,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-18 00:45:53,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:53,291 [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-18 00:45:53,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:53,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-18 00:45:54,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:54,242 [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-18 00:45:54,243 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-18 00:45:54,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:54,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-18 00:45:54,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:55,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-18 00:45:55,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:55,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-18 00:45:55,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:56,179 [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-18 00:45:56,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:56,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-18 00:45:56,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:57,046 [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-18 00:45:57,047 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-18 00:45:57,047 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:45:57,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-18 00:45:57,047 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:57,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:57,054 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:45:57,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:45:57,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:45:57,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:45:57,075 [ scc.git] DEBUG Already up to date.
2025-02-18 00:45:57,075 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-18 00:45:58,086 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-18 00:45:58,086 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-18 00:45:58,092 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-18 00:45:58,707 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-18 00:45:58,707 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-18 00:45:58,712 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:45:58,712 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:58,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:58,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-18 00:45:58,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:58,731 [ 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-18 00:45:58,940 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-18 00:45:58,940 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-18 00:45:58,940 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-18 00:45:58,941 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-18 00:45:58,941 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:45:58,942 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:45:58,949 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-18 00:45:58,957 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-18 00:45:58,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:59,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:59,139 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-18 00:45:59,148 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-18 00:45:59,233 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-02-18 00:45:59,239 [ scc.config] DEBUG Found github.token
2025-02-18 00:45:59,240 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-18 00:45:59,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-18 00:45:59,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:59,255 [ 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-18 00:45:59,389 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-18 00:45:59,389 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-18 00:45:59,389 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-18 00:45:59,389 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:45:59,390 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:45:59,399 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-18 00:45:59,407 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-18 00:45:59,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:45:59,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:45:59,583 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-18 00:45:59,594 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-18 00:45:59,605 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/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-18 00:45:59,616 [ scc.config] DEBUG Found github.token
2025-02-18 00:45:59,616 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-18 00:45:59,616 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:45:59,700 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:45:59,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:45:59,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:45:59,783 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:45:59,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f6d2e070> has no local changes
2025-02-18 00:45:59,793 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:45:59,806 [ scc.git] DEBUG [detached HEAD dd97e0d] merge master -Dorg -Ssuccess-only
2025-02-18 00:45:59,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:45:59,806 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:45:59,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:00,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-18 00:46:00,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:00,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-18 00:46:00,634 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-18 00:46:00,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:01,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-18 00:46:01,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:01,773 [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-18 00:46:02,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:02,341 [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-18 00:46:02,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:02,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-18 00:46:03,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:03,269 [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-18 00:46:03,270 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-18 00:46:03,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:03,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-18 00:46:04,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:04,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-18 00:46:04,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:04,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-18 00:46:04,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:05,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-18 00:46:05,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:05,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-18 00:46:05,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:06,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-18 00:46:06,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:06,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-18 00:46:06,689 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:06,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-18 00:46:06,689 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:06,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:06,695 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:06,700 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:06,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:06,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:06,714 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:06,714 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-18 00:46:07,022 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-18 00:46:07,023 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-18 00:46:07,028 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:07,028 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:07,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-18 00:46:07,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,046 [ 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-18 00:46:07,094 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:46:07,098 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-18 00:46:07,098 [ scc.git] DEBUG package.json | 2 +-
2025-02-18 00:46:07,098 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-18 00:46:07,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:07,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:07,301 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:07,346 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:07,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:07,402 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:07,410 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f5cf5e50> has no local changes
2025-02-18 00:46:07,410 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:07,420 [ scc.git] DEBUG [detached HEAD 43c38d7] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:07,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:07,421 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:07,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:07,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-18 00:46:07,734 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:07,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-18 00:46:07,734 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:07,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:07,746 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:07,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:07,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:07,758 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:07,758 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:07,758 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:07,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,763 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:07,802 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:07,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:07,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:07,847 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:07,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f5cf5f70> has no local changes
2025-02-18 00:46:07,854 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:07,863 [ scc.git] DEBUG [detached HEAD 86badaf] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:07,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:07,864 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:07,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:08,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-18 00:46:08,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:08,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-18 00:46:08,705 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:08,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-18 00:46:08,705 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:08,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:08,717 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:08,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:08,723 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:08,729 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:08,735 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:08,735 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:08,735 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:08,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:08,740 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:08,788 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:08,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:08,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:08,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:08,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f449a0a0> has no local changes
2025-02-18 00:46:08,845 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:08,856 [ scc.git] DEBUG [detached HEAD 38585d9] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:08,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:08,857 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:08,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:09,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-18 00:46:09,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:09,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-18 00:46:10,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:10,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-18 00:46:10,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:10,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-18 00:46:11,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:11,319 [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-18 00:46:11,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:11,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-18 00:46:12,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:12,329 [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-18 00:46:12,330 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-18 00:46:12,330 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:12,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-18 00:46:12,331 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:12,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:12,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:12,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:12,344 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:12,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:12,357 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:12,358 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-18 00:46:12,761 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-18 00:46:12,761 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-18 00:46:12,767 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:12,767 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:12,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:12,773 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-18 00:46:12,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:12,789 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-18 00:46:12,962 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-18 00:46:12,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG Auto-merging setup.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-18 00:46:12,963 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:46:12,963 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:46:12,970 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-18 00:46:12,978 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-18 00:46:12,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:13,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:13,145 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-18 00:46:13,153 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-18 00:46:13,162 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-02-18 00:46:13,169 [ scc.config] DEBUG Found github.token
2025-02-18 00:46:13,169 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-18 00:46:13,170 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:13,216 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:13,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:13,223 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:13,268 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:13,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f44b0b20> has no local changes
2025-02-18 00:46:13,276 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:13,286 [ scc.git] DEBUG [detached HEAD 9ca245f] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:13,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:13,287 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:13,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:13,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-18 00:46:13,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:14,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-18 00:46:14,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:14,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-18 00:46:14,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:15,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-18 00:46:15,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:15,694 [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-18 00:46:15,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:16,188 [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-18 00:46:16,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:16,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-18 00:46:16,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:17,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-18 00:46:17,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:17,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-18 00:46:17,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:18,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-18 00:46:18,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:18,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-18 00:46:18,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:19,281 [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-18 00:46:19,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:19,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-18 00:46:20,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:20,266 [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-18 00:46:20,267 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-18 00:46:20,267 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:20,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-18 00:46:20,268 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:20,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:20,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:20,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:20,282 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:20,289 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:20,299 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:20,299 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-18 00:46:20,611 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-18 00:46:20,611 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-18 00:46:20,616 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:20,616 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:20,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:20,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-18 00:46:20,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:20,635 [ 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-18 00:46:20,780 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-18 00:46:20,784 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-18 00:46:20,785 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-18 00:46:20,785 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-18 00:46:20,785 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-18 00:46:20,785 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-18 00:46:20,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:20,787 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-18 00:46:20,787 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-18 00:46:20,788 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-18 00:46:20,788 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-18 00:46:20,788 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-18 00:46:20,788 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-18 00:46:20,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:20,966 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:21,010 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:21,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:21,016 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:21,062 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:21,069 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f446fac0> has no local changes
2025-02-18 00:46:21,069 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:21,077 [ scc.git] DEBUG [detached HEAD cf579c6] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:21,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:21,078 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:21,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:21,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-18 00:46:21,419 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:21,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-18 00:46:21,419 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:21,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:21,425 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:21,431 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:21,431 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:21,436 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:21,442 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:21,442 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:21,442 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:21,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:21,447 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:21,494 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:21,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:21,500 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:21,543 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:21,550 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f6d210a0> has no local changes
2025-02-18 00:46:21,551 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:21,560 [ scc.git] DEBUG [detached HEAD c46d0bd] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:21,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:21,560 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:21,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:21,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-18 00:46:22,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:22,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-18 00:46:22,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:22,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-18 00:46:23,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:23,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-18 00:46:23,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:23,919 [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-18 00:46:24,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:24,389 [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-18 00:46:24,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:24,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-18 00:46:25,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:25,258 [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-18 00:46:25,259 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-18 00:46:25,259 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:25,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-18 00:46:25,259 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:25,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:25,267 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:25,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:25,273 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:25,278 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:25,284 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:25,285 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-18 00:46:26,019 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-18 00:46:26,019 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-18 00:46:26,024 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:26,024 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:26,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:26,030 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-18 00:46:26,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:26,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-18 00:46:26,073 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:46:26,076 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-18 00:46:26,076 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-18 00:46:26,076 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-18 00:46:26,076 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-18 00:46:26,076 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-18 00:46:26,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:26,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:26,248 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:26,292 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:26,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:26,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:26,341 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:26,349 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f4445b20> has no local changes
2025-02-18 00:46:26,349 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:26,359 [ scc.git] DEBUG [detached HEAD 972e688] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:26,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:26,359 [ scc.git] INFO Overriding base-branch from master to main
2025-02-18 00:46:26,359 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:26,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:26,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-18 00:46:27,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:27,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-18 00:46:27,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:27,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-18 00:46:28,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:28,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-18 00:46:28,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:28,804 [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-18 00:46:29,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:29,327 [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-18 00:46:29,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:29,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-18 00:46:30,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:30,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-18 00:46:30,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:30,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-18 00:46:31,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:31,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-18 00:46:31,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:31,762 [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-18 00:46:32,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:32,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-18 00:46:32,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:32,633 [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-18 00:46:32,634 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-18 00:46:32,634 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:32,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-18 00:46:32,634 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:32,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:32,641 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-18 00:46:32,647 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:32,647 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-18 00:46:32,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-18 00:46:32,659 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:32,660 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-18 00:46:32,968 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-18 00:46:32,968 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-18 00:46:32,973 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:32,973 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:32,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:32,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-18 00:46:32,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:32,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-18 00:46:33,228 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-18 00:46:33,228 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-18 00:46:33,228 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:46:33,228 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:46:33,235 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-18 00:46:33,241 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-18 00:46:33,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:33,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:33,426 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-18 00:46:33,433 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-18 00:46:33,439 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-18 00:46:33,444 [ scc.config] DEBUG Found github.token
2025-02-18 00:46:33,444 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-18 00:46:33,445 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:33,489 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:33,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:33,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:33,540 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:33,547 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f44b0a90> has no local changes
2025-02-18 00:46:33,547 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:33,556 [ scc.git] DEBUG [detached HEAD f2b1ed6] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:33,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:33,556 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:33,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:33,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-18 00:46:33,875 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:33,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-18 00:46:33,875 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:33,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:33,881 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:33,887 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:33,887 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:33,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:33,897 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:33,898 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:33,898 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:33,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:33,902 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:33,945 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:33,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:33,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:33,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:34,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f4425400> has no local changes
2025-02-18 00:46:34,001 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:34,010 [ scc.git] DEBUG [detached HEAD e3fd745] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:34,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:34,010 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:34,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:34,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-18 00:46:34,309 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:34,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-18 00:46:34,309 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:34,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:34,316 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:34,321 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:34,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:34,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:34,334 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:34,334 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:34,334 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:34,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:34,340 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:34,383 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:34,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:34,389 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:34,430 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:34,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f4448070> has no local changes
2025-02-18 00:46:34,438 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:34,449 [ scc.git] DEBUG [detached HEAD 1896848] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:34,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:34,449 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:34,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:34,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-18 00:46:35,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:35,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-18 00:46:35,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:35,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-18 00:46:36,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:36,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-18 00:46:36,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:36,857 [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-18 00:46:37,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:37,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-18 00:46:37,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:37,792 [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-18 00:46:37,793 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-18 00:46:37,793 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:37,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-18 00:46:37,793 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:37,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:37,800 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-18 00:46:37,806 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:37,806 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-18 00:46:37,813 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-18 00:46:37,833 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:37,834 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-18 00:46:38,353 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-18 00:46:38,353 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-18 00:46:38,358 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:38,358 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:38,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:38,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-18 00:46:38,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:38,379 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-18 00:46:38,391 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-18 00:46:38,391 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-18 00:46:38,391 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:46:38,392 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:46:38,399 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-18 00:46:38,407 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-18 00:46:38,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:38,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:38,586 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-18 00:46:38,593 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-18 00:46:38,599 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-18 00:46:38,605 [ scc.config] DEBUG Found github.token
2025-02-18 00:46:38,605 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-18 00:46:38,605 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:38,650 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:38,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:38,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:38,700 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:38,708 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f4452070> has no local changes
2025-02-18 00:46:38,709 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:38,719 [ scc.git] DEBUG [detached HEAD a0bdbe0] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:38,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:38,720 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-18 00:46:38,720 [ scc.repo] DEBUG ## PRs found:
2025-02-18 00:46:38,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:39,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-18 00:46:39,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:39,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-18 00:46:39,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:40,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-18 00:46:40,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:40,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-18 00:46:40,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:41,078 [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-18 00:46:41,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:41,554 [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-18 00:46:41,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:42,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-18 00:46:42,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:42,531 [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-18 00:46:42,532 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-18 00:46:42,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:43,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-18 00:46:43,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:43,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-18 00:46:43,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:43,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-18 00:46:44,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:44,421 [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-18 00:46:44,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:44,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-18 00:46:45,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:45,343 [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-18 00:46:45,344 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-18 00:46:45,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:45,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-18 00:46:46,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:46,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-18 00:46:46,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:46,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-18 00:46:47,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:47,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-18 00:46:47,294 [ scc.repo] DEBUG ## Branches found:
2025-02-18 00:46:47,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-18 00:46:47,295 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:47,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:47,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-18 00:46:47,306 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-18 00:46:47,306 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-18 00:46:47,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-18 00:46:47,318 [ scc.git] DEBUG Already up to date.
2025-02-18 00:46:47,318 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-18 00:46:48,233 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-18 00:46:48,233 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-18 00:46:48,238 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-18 00:46:48,917 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-18 00:46:48,917 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-18 00:46:48,923 [ scc.git] DEBUG ## Unique users: []
2025-02-18 00:46:48,923 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:48,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:48,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-18 00:46:48,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:48,945 [ 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-18 00:46:48,984 [ 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-18 00:46:48,985 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-18 00:46:48,985 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-18 00:46:48,991 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-18 00:46:48,998 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-18 00:46:49,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:49,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:49,172 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-18 00:46:49,181 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-18 00:46:49,189 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#336](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-18 00:46:49,195 [ scc.config] DEBUG Found github.token
2025-02-18 00:46:49,195 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-18 00:46:49,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-18 00:46:49,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:49,210 [ 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-18 00:46:49,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-18 00:46:49,232 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-18 00:46:49,232 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-18 00:46:49,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:49,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:49,577 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-18 00:46:49,620 [ scc.git] DEBUG Get sha1 of %s
2025-02-18 00:46:49,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-18 00:46:49,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:49,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:49,677 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f443fdc0> has no local changes
2025-02-18 00:46:49,678 [ 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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:49,689 [ scc.git] DEBUG [detached HEAD b577601] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:49,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:49,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-18 00:46:49,775 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-18 00:46:49,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:50,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:50,016 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-18 00:46:50,023 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-18 00:46:50,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:50,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:50,457 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-18 00:46:50,463 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-18 00:46:50,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:50,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:50,865 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-18 00:46:50,870 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-18 00:46:51,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:51,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:51,311 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-18 00:46:51,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:51,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:51,729 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-18 00:46:51,736 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-18 00:46:51,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:52,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:52,137 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-18 00:46:52,143 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-18 00:46:52,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:52,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:52,566 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-18 00:46:52,572 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-18 00:46:52,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:52,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:52,982 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-18 00:46:52,990 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-18 00:46:53,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:53,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:53,390 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-18 00:46:53,396 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-18 00:46:53,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:53,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:53,811 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-18 00:46:53,816 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-18 00:46:54,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:54,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:54,218 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-18 00:46:54,224 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-18 00:46:54,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:54,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:54,636 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-18 00:46:54,641 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-18 00:46:54,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:55,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:55,053 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-18 00:46:55,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:55,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:55,479 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-18 00:46:55,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:55,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:55,885 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-18 00:46:55,892 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-18 00:46:56,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:56,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:56,312 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-18 00:46:56,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:56,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:56,742 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-18 00:46:56,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:57,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:57,155 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-18 00:46:57,160 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-18 00:46:57,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:57,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:57,583 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-18 00:46:57,590 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-18 00:46:57,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:57,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:58,004 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-18 00:46:58,010 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-18 00:46:58,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:58,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:58,460 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-18 00:46:58,466 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-18 00:46:58,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-18 00:46:58,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-18 00:46:58,875 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-18 00:46:58,876 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-18 00:46:58,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2f7e08cd0> has local changes
2025-02-18 00:46:58,965 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
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 616 Rdornier 'Fix labels around border'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
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'
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#336 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/336/)'
2025-02-18 00:46:58,982 [ scc.git] DEBUG [detached HEAD d8fd28e] merge master -Dorg -Ssuccess-only
2025-02-18 00:46:58,982 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-18 00:46:58,982 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-18 00:46:58,982 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-18 00:46:58,983 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-18 00:46:58,983 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-18 00:46:58,983 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-18 00:46:58,983 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-18 00:46:58,983 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-18 00:46:58,983 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-18 00:46:58,983 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,983 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-18 00:46:58,983 [ scc.merge] INFO
2025-02-18 00:46:58,983 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,984 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-18 00:46:58,984 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-18 00:46:58,984 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,984 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,984 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-18 00:46:58,984 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,984 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,984 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,984 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-18 00:46:58,984 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,984 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-18 00:46:58,985 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-18 00:46:58,985 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-18 00:46:58,985 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-18 00:46:58,985 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-18 00:46:58,985 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-18 00:46:58,985 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-18 00:46:58,985 [ scc.merge] INFO
2025-02-18 00:46:58,985 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-18 00:46:58,986 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-18 00:46:58,986 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-18 00:46:58,986 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,986 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-18 00:46:58,986 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,986 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-18 00:46:58,987 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Repository: ome/scripts
2025-02-18 00:46:58,987 [ scc.merge] INFO Excluded PRs:
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-18 00:46:58,987 [ scc.merge] INFO Already up to date.
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Merged PRs:
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-18 00:46:58,987 [ scc.merge] INFO
2025-02-18 00:46:58,987 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-18 00:46:58,987 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-18 00:46:58,988 [ scc.merge] INFO
2025-02-18 00:46:58,988 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-18 00:46:58,988 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:58,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-18 00:46:58,994 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:58,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:58,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-18 00:46:58,999 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-18 00:46:59,005 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-18 00:46:59,012 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-18 00:46:59,018 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-18 00:46:59,024 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-18 00:46:59,030 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-18 00:46:59,036 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-18 00:46:59,042 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-18 00:46:59,048 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-18 00:46:59,055 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-18 00:46:59,061 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-18 00:46:59,067 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-18 00:46:59,074 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-18 00:46:59,080 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-18 00:46:59,087 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-18 00:46:59,094 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-18 00:46:59,100 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-18 00:46:59,106 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-18 00:46:59,113 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-18 00:46:59,119 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-18 00:46:59,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-18 00:46:59,127 [ scc.git] DEBUG Calling 'git remote'
2025-02-18 00:46:59,132 [ 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 3d93079] 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 ab6ed23] 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-18 00:47:49,332 [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-18 00:47:58,711 [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-18 00:48:01,182 [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-18 00:48:06,109 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-18 00:48:46,313 [ 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/0005d222/images/svgs/logo.svg){kind=logo}
