Skipping 225 KB..
Full Log2025-04-10 00:42:18,491 [ scc.git] DEBUG package.json | 2 +-
2025-04-10 00:42:18,491 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-10 00:42:18,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:18,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:18,870 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-10 00:42:18,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:18,878 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-10 00:42:18,916 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-10 00:42:18,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-10 00:42:18,917 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:42:18,917 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:42:18,920 [ scc.git] DEBUG Calling 'git reset --hard 6a081945674923b1d5eccb18c19dd09293bde506'
2025-04-10 00:42:18,929 [ scc.git] DEBUG HEAD is now at 6a08194 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-10 00:42:19,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:19,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:19,284 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-10 00:42:19,287 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-10 00:42:19,290 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-10 00:42:19,292 [ scc.config] DEBUG Found github.token
2025-04-10 00:42:19,292 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-10 00:42:19,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-10 00:42:19,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:19,301 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-10 00:42:19,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:19,320 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-10 00:42:19,320 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-10 00:42:19,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:19,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:19,699 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:19,739 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:19,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:19,741 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:19,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:19,784 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0378991b10> has no local changes
2025-04-10 00:42:19,784 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:19,792 [ scc.git] DEBUG [detached HEAD 4959f3b] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:19,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:19,792 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:19,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:20,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-10 00:42:20,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:20,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-10 00:42:20,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:21,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-10 00:42:21,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:21,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-10 00:42:21,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:22,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-10 00:42:22,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:22,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:22,682 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:42:22,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:23,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-10 00:42:23,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:23,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-10 00:42:23,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:24,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-10 00:42:24,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:24,702 [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-04-10 00:42:24,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:25,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-10 00:42:25,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:25,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:25,624 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-10 00:42:25,625 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:25,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-10 00:42:25,625 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:25,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:25,628 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:25,630 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:25,630 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:25,633 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:25,636 [ scc.git] DEBUG Already up to date.
2025-04-10 00:42:25,637 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-10 00:42:25,913 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-10 00:42:25,913 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-10 00:42:25,918 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-10 00:42:26,212 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-10 00:42:26,213 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-10 00:42:26,217 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:26,217 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:26,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:26,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-10 00:42:26,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:26,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-10 00:42:26,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:26,239 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-10 00:42:26,239 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-10 00:42:26,239 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-10 00:42:26,239 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-10 00:42:26,239 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-10 00:42:26,239 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-10 00:42:26,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:26,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:26,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-10 00:42:26,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:26,417 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-10 00:42:26,426 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:26,429 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-10 00:42:26,429 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-10 00:42:26,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:26,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:26,822 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:26,860 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:26,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:26,862 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:26,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:26,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0379793a50> has no local changes
2025-04-10 00:42:26,904 [ 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'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:26,911 [ scc.git] DEBUG [detached HEAD 3471075] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:26,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:26,912 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:27,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:27,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-10 00:42:27,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:27,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-10 00:42:28,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:28,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-10 00:42:28,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:28,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-10 00:42:29,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:29,407 [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-04-10 00:42:29,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:29,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-10 00:42:30,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:30,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:30,369 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-10 00:42:30,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:30,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-10 00:42:31,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:31,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-10 00:42:31,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:31,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-10 00:42:32,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:32,313 [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-04-10 00:42:32,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:32,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-10 00:42:33,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:33,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:33,248 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-10 00:42:33,248 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:33,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-10 00:42:33,248 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:33,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:33,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:33,253 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:33,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:33,257 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:33,265 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-10 00:42:33,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:33,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-10 00:42:33,901 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-10 00:42:34,195 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-10 00:42:34,196 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-10 00:42:34,199 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-10 00:42:34,475 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-10 00:42:34,475 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-10 00:42:34,479 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:34,479 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:34,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:34,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-10 00:42:34,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:34,489 [ 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-04-10 00:42:34,503 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-10 00:42:34,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-10 00:42:34,503 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-10 00:42:34,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-10 00:42:34,503 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:42:34,503 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:42:34,506 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-10 00:42:34,511 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-10 00:42:34,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:34,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:34,667 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-10 00:42:34,671 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-10 00:42:34,675 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-10 00:42:34,677 [ scc.config] DEBUG Found github.token
2025-04-10 00:42:34,677 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-10 00:42:34,677 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-10 00:42:34,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:34,684 [ 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-04-10 00:42:34,699 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-10 00:42:34,699 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-10 00:42:34,699 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-10 00:42:34,699 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:42:34,699 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:42:34,702 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-10 00:42:34,707 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-10 00:42:34,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:35,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:35,085 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-10 00:42:35,090 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-10 00:42:35,093 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/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-04-10 00:42:35,095 [ scc.config] DEBUG Found github.token
2025-04-10 00:42:35,095 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-10 00:42:35,095 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:35,133 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:35,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:35,135 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:35,173 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:35,177 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03787ed690> has no local changes
2025-04-10 00:42:35,178 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:35,184 [ scc.git] DEBUG [detached HEAD df48ed8] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:35,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:35,185 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:35,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:35,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-10 00:42:35,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:36,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-10 00:42:36,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:36,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-10 00:42:36,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:37,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-10 00:42:37,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:37,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-10 00:42:37,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:38,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-10 00:42:38,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:38,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:38,518 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:42:38,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:39,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-10 00:42:39,020 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-10 00:42:39,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:39,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-10 00:42:39,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:40,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-10 00:42:40,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:40,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-10 00:42:40,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:41,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-10 00:42:41,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:41,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:41,661 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-10 00:42:41,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:42,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-10 00:42:42,147 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-10 00:42:42,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:42,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-10 00:42:42,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:43,207 [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-04-10 00:42:43,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:43,724 [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-04-10 00:42:43,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:44,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-10 00:42:44,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:44,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:44,746 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-10 00:42:44,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:45,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-10 00:42:45,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:45,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-10 00:42:45,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:46,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-10 00:42:46,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:46,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-10 00:42:46,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:47,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-10 00:42:47,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:47,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-10 00:42:47,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:48,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-10 00:42:48,251 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:48,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-10 00:42:48,251 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:48,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:48,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:48,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:48,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:48,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:48,263 [ scc.git] DEBUG Already up to date.
2025-04-10 00:42:48,263 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-10 00:42:48,558 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-10 00:42:48,558 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-10 00:42:48,562 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-10 00:42:48,838 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-10 00:42:48,838 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-10 00:42:48,842 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-10 00:42:49,118 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-10 00:42:49,118 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-10 00:42:49,123 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:49,123 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:49,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:49,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-10 00:42:49,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:49,131 [ 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-04-10 00:42:49,139 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:49,143 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-10 00:42:49,143 [ scc.git] DEBUG package.json | 2 +-
2025-04-10 00:42:49,143 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-10 00:42:49,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:49,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:49,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-10 00:42:49,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:49,309 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-10 00:42:49,319 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-10 00:42:49,320 [ scc.git] DEBUG Auto-merging package.json
2025-04-10 00:42:49,320 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:49,324 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-10 00:42:49,324 [ scc.git] DEBUG package.json | 2 +-
2025-04-10 00:42:49,324 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-10 00:42:49,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:49,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:49,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-10 00:42:49,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:49,717 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-10 00:42:49,726 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:42:49,728 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-10 00:42:49,728 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-10 00:42:49,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:50,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:50,123 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:50,161 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:50,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:50,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:50,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:50,207 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f037890d8d0> has no local changes
2025-04-10 00:42:50,207 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:50,213 [ scc.git] DEBUG [detached HEAD a653093] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:50,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:50,214 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:50,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:50,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-10 00:42:50,594 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:50,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-10 00:42:50,594 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:50,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:50,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:50,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:50,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:50,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:50,605 [ scc.git] DEBUG Already up to date.
2025-04-10 00:42:50,605 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:50,605 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:50,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:50,608 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:50,646 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:50,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:50,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:50,686 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:50,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03755367d0> has no local changes
2025-04-10 00:42:50,689 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:50,696 [ scc.git] DEBUG [detached HEAD 41d1fb3] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:50,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:50,696 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:50,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:51,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-10 00:42:51,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:51,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-10 00:42:51,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:52,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-10 00:42:52,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:52,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-10 00:42:52,600 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:52,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-10 00:42:52,600 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:52,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:52,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:52,605 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:52,605 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:52,608 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:52,611 [ scc.git] DEBUG Already up to date.
2025-04-10 00:42:52,611 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:52,611 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:52,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:52,613 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:52,651 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:52,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:52,654 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:52,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:52,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03788bad90> has no local changes
2025-04-10 00:42:52,694 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:52,701 [ scc.git] DEBUG [detached HEAD df2b447] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:52,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:52,701 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:52,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:53,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-10 00:42:53,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:53,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-10 00:42:53,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:54,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-10 00:42:54,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:54,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-10 00:42:55,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:55,299 [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-04-10 00:42:55,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:55,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-10 00:42:56,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:56,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:42:56,220 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-10 00:42:56,220 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:42:56,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-10 00:42:56,220 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:56,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:56,223 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:42:56,226 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:42:56,226 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:42:56,229 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:42:56,232 [ scc.git] DEBUG Already up to date.
2025-04-10 00:42:56,232 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-10 00:42:56,507 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-10 00:42:56,507 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-10 00:42:56,510 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:42:56,511 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:56,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:56,513 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-10 00:42:56,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:56,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-10 00:42:56,527 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG Auto-merging setup.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-10 00:42:56,528 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:42:56,528 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:42:56,531 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-10 00:42:56,535 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-10 00:42:56,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:56,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:42:56,694 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-10 00:42:56,698 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-10 00:42:56,701 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-04-10 00:42:56,703 [ scc.config] DEBUG Found github.token
2025-04-10 00:42:56,703 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-10 00:42:56,703 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:42:56,741 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:42:56,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:42:56,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:42:56,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:42:56,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0378634450> has no local changes
2025-04-10 00:42:56,786 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:42:56,793 [ scc.git] DEBUG [detached HEAD 0317db3] merge master -Dorg -Ssuccess-only
2025-04-10 00:42:56,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:42:56,793 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:42:56,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:57,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-10 00:42:57,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:57,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-10 00:42:57,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:58,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-10 00:42:58,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:58,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-10 00:42:59,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:59,241 [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-04-10 00:42:59,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:42:59,727 [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-04-10 00:42:59,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:00,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-10 00:43:00,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:00,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-10 00:43:00,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:01,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-10 00:43:01,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:01,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-10 00:43:01,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:02,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-10 00:43:02,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:02,584 [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-04-10 00:43:02,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:03,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-10 00:43:03,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:03,516 [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-04-10 00:43:03,516 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-10 00:43:03,517 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:03,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-10 00:43:03,517 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:03,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:03,520 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:03,522 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:03,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:03,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:03,528 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:03,528 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-10 00:43:03,832 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-10 00:43:03,832 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-10 00:43:03,836 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:03,836 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:03,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:03,838 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-10 00:43:03,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:03,845 [ 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-04-10 00:43:03,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-10 00:43:03,861 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-10 00:43:03,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:03,862 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-10 00:43:03,862 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-10 00:43:03,862 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-10 00:43:03,862 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-10 00:43:03,862 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-10 00:43:03,863 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-10 00:43:03,863 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-10 00:43:03,863 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-10 00:43:03,864 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-10 00:43:04,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:04,023 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:04,063 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:04,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:04,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:04,103 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:04,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f037551aed0> has no local changes
2025-04-10 00:43:04,108 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:04,114 [ scc.git] DEBUG [detached HEAD 3b492f2] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:04,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:04,114 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:04,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:04,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-10 00:43:04,469 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:04,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-10 00:43:04,469 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:04,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:04,472 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:04,474 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:04,474 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:04,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:04,480 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:04,480 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:04,480 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:04,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:04,482 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:04,520 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:04,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:04,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:04,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:04,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03788fd3d0> has no local changes
2025-04-10 00:43:04,562 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:04,568 [ scc.git] DEBUG [detached HEAD 82db108] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:04,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:04,568 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:04,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:04,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-10 00:43:05,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:05,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-10 00:43:05,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:05,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-10 00:43:06,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:06,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-10 00:43:06,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:06,980 [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-04-10 00:43:07,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:07,444 [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-04-10 00:43:07,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:07,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-10 00:43:08,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:08,432 [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-04-10 00:43:08,433 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-10 00:43:08,433 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:08,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-10 00:43:08,433 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:08,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:08,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:08,438 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:08,438 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:08,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:08,444 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:08,444 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-10 00:43:08,726 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-10 00:43:08,726 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-10 00:43:08,730 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:08,730 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:08,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:08,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-10 00:43:08,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:08,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-10 00:43:08,745 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:43:08,748 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-10 00:43:08,749 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-10 00:43:08,749 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-10 00:43:08,749 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-10 00:43:08,749 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-10 00:43:08,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:08,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:08,910 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:08,950 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:08,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:08,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:08,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:08,993 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0375542290> has no local changes
2025-04-10 00:43:08,993 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:09,000 [ scc.git] DEBUG [detached HEAD 69fcd1b] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:09,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:09,000 [ scc.git] INFO Overriding base-branch from master to main
2025-04-10 00:43:09,000 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:09,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:09,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-10 00:43:09,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:09,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-10 00:43:10,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:10,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-10 00:43:10,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:10,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-10 00:43:11,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:11,463 [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-04-10 00:43:11,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:11,933 [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-04-10 00:43:12,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:12,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-10 00:43:12,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:12,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-10 00:43:13,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:13,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-10 00:43:13,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:13,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-10 00:43:14,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:14,380 [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-04-10 00:43:14,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:14,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-10 00:43:15,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:15,361 [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-04-10 00:43:15,362 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-10 00:43:15,362 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:15,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-10 00:43:15,362 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:15,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:15,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-10 00:43:15,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:15,368 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-10 00:43:15,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-10 00:43:15,374 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:15,374 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-10 00:43:15,681 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-10 00:43:15,681 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-10 00:43:15,685 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:15,685 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:15,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:15,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-10 00:43:15,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:15,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-10 00:43:15,700 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-10 00:43:15,701 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-10 00:43:15,701 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:43:15,701 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:43:15,704 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-10 00:43:15,708 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-10 00:43:15,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:15,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:15,870 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-10 00:43:15,873 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-10 00:43:15,876 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-10 00:43:15,878 [ scc.config] DEBUG Found github.token
2025-04-10 00:43:15,878 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-10 00:43:15,878 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:15,916 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:15,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:15,919 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:15,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:15,959 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0375548750> has no local changes
2025-04-10 00:43:15,959 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:15,966 [ scc.git] DEBUG [detached HEAD 00f5d2f] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:15,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:15,966 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:16,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:16,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-10 00:43:16,331 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:16,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-10 00:43:16,332 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,334 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:16,336 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:16,336 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:16,339 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:16,342 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:16,342 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:16,342 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,345 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:16,382 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,385 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:16,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:16,425 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0375568a90> has no local changes
2025-04-10 00:43:16,425 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:16,431 [ scc.git] DEBUG [detached HEAD 465212f] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:16,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:16,431 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:16,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:16,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-10 00:43:16,771 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:16,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-10 00:43:16,772 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,774 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:16,776 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:16,776 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:16,779 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:16,782 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:16,782 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:16,782 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:16,823 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:16,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:16,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:16,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:16,866 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0375530250> has no local changes
2025-04-10 00:43:16,866 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:16,872 [ scc.git] DEBUG [detached HEAD 272c85e] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:16,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:16,873 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:17,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:17,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-10 00:43:17,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:17,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-10 00:43:18,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:18,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-10 00:43:18,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:18,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-10 00:43:19,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:19,245 [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-04-10 00:43:19,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:19,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-10 00:43:19,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:20,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:43:20,135 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-10 00:43:20,135 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:20,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-10 00:43:20,135 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:20,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:20,138 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-10 00:43:20,141 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:20,141 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-10 00:43:20,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-10 00:43:20,146 [ scc.git] DEBUG Already up to date.
2025-04-10 00:43:20,146 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-10 00:43:20,431 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-10 00:43:20,431 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-10 00:43:20,435 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:20,435 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:20,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:20,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-10 00:43:20,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:20,443 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-10 00:43:20,452 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-10 00:43:20,452 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-10 00:43:20,452 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:43:20,452 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:43:20,455 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-10 00:43:20,460 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-10 00:43:20,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:20,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:20,623 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-10 00:43:20,626 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-10 00:43:20,628 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-10 00:43:20,630 [ scc.config] DEBUG Found github.token
2025-04-10 00:43:20,631 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-10 00:43:20,631 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:20,669 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:20,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:20,672 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:20,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:20,713 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0378639a10> has no local changes
2025-04-10 00:43:20,713 [ 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#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:20,720 [ scc.git] DEBUG [detached HEAD c17fa07] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:20,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:20,720 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-10 00:43:20,720 [ scc.repo] DEBUG ## PRs found:
2025-04-10 00:43:20,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:21,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-10 00:43:21,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:21,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-10 00:43:21,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:22,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-10 00:43:22,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:22,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-10 00:43:22,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:23,097 [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-04-10 00:43:23,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:23,582 [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-04-10 00:43:23,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:24,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-10 00:43:24,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:24,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:43:24,482 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-10 00:43:24,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:24,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-10 00:43:25,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:25,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-10 00:43:25,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:25,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-10 00:43:26,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:26,366 [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-04-10 00:43:26,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:26,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-10 00:43:27,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:27,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-10 00:43:27,288 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-10 00:43:27,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:27,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-10 00:43:28,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:28,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-10 00:43:28,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:28,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-10 00:43:29,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:29,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-10 00:43:29,334 [ scc.repo] DEBUG ## Branches found:
2025-04-10 00:43:29,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-10 00:43:29,334 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:29,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:29,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-10 00:43:29,339 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-10 00:43:29,339 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-10 00:43:29,342 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-10 00:43:29,350 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-10 00:43:29,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:30,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-10 00:43:30,008 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-10 00:43:30,290 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-10 00:43:30,290 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-10 00:43:30,295 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-10 00:43:30,572 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-10 00:43:30,572 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-10 00:43:30,576 [ scc.git] DEBUG ## Unique users: []
2025-04-10 00:43:30,576 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:30,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:30,578 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-10 00:43:30,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:30,586 [ 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-04-10 00:43:30,596 [ 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-04-10 00:43:30,597 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-10 00:43:30,597 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-10 00:43:30,600 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-10 00:43:30,604 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-10 00:43:30,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:30,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:30,765 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-10 00:43:30,770 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-10 00:43:30,774 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#384](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-10 00:43:30,777 [ scc.config] DEBUG Found github.token
2025-04-10 00:43:30,777 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-10 00:43:30,777 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-10 00:43:30,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:30,784 [ 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-04-10 00:43:30,794 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-10 00:43:30,797 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-10 00:43:30,797 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-10 00:43:31,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:31,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:31,173 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-10 00:43:31,212 [ scc.git] DEBUG Get sha1 of %s
2025-04-10 00:43:31,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-10 00:43:31,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:31,251 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:31,255 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0375573f50> has no local changes
2025-04-10 00:43:31,255 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:31,262 [ scc.git] DEBUG [detached HEAD 49316a6] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:31,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:31,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-10 00:43:31,339 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-10 00:43:31,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:31,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:31,608 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-10 00:43:31,610 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-10 00:43:31,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:32,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:32,018 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-10 00:43:32,020 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-10 00:43:32,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:32,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:32,462 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-10 00:43:32,464 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-10 00:43:32,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:32,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:32,872 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-10 00:43:33,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:33,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:33,283 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-10 00:43:33,285 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-10 00:43:33,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:33,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:33,692 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-10 00:43:33,694 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-10 00:43:33,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:34,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:34,106 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-10 00:43:34,108 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-10 00:43:34,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:34,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:34,521 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-10 00:43:34,523 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-10 00:43:34,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:34,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:34,928 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-10 00:43:34,930 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-10 00:43:35,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:35,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:35,346 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-10 00:43:35,348 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-10 00:43:35,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:35,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:35,758 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-10 00:43:35,760 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-10 00:43:36,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:36,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:36,165 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-10 00:43:36,167 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-10 00:43:36,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:36,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:36,587 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-10 00:43:36,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:37,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:37,012 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-10 00:43:37,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:37,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:37,429 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-10 00:43:37,431 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-10 00:43:37,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:37,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:37,851 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-10 00:43:38,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:38,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:38,259 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-10 00:43:38,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:38,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:38,669 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-10 00:43:38,671 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-10 00:43:38,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:39,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:39,104 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-10 00:43:39,106 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-10 00:43:39,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:39,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:39,519 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-10 00:43:39,521 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-10 00:43:39,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:39,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:39,962 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-10 00:43:39,964 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-10 00:43:40,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-10 00:43:40,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-10 00:43:40,375 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-10 00:43:40,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-10 00:43:40,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0379688fd0> has local changes
2025-04-10 00:43:40,461 [ 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 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#384 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/384/)'
2025-04-10 00:43:40,475 [ scc.git] DEBUG [detached HEAD e3e59c8] merge master -Dorg -Ssuccess-only
2025-04-10 00:43:40,475 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-10 00:43:40,476 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-10 00:43:40,476 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-10 00:43:40,476 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-10 00:43:40,476 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-10 00:43:40,476 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-10 00:43:40,476 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-10 00:43:40,476 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-10 00:43:40,476 [ scc.merge] INFO
2025-04-10 00:43:40,476 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-10 00:43:40,476 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,476 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-10 00:43:40,477 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-10 00:43:40,477 [ scc.merge] INFO Previously merged:
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-10 00:43:40,477 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-10 00:43:40,477 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-10 00:43:40,477 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,477 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-10 00:43:40,477 [ scc.merge] INFO
2025-04-10 00:43:40,477 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-10 00:43:40,477 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-10 00:43:40,478 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-10 00:43:40,478 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-10 00:43:40,478 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-10 00:43:40,478 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-10 00:43:40,478 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,478 [ scc.merge] INFO
2025-04-10 00:43:40,478 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-10 00:43:40,479 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-10 00:43:40,479 [ scc.merge] INFO Previously merged:
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-10 00:43:40,479 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-10 00:43:40,479 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-10 00:43:40,479 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-10 00:43:40,479 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-10 00:43:40,479 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-10 00:43:40,479 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,479 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-10 00:43:40,479 [ scc.merge] INFO
2025-04-10 00:43:40,479 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-10 00:43:40,480 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-10 00:43:40,480 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-10 00:43:40,480 [ scc.merge] INFO Already up to date.
2025-04-10 00:43:40,480 [ scc.merge] INFO
2025-04-10 00:43:40,480 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,480 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-10 00:43:40,481 [ scc.merge] INFO
2025-04-10 00:43:40,481 [ scc.merge] INFO Repository: ome/scripts
2025-04-10 00:43:40,481 [ scc.merge] INFO Excluded PRs:
2025-04-10 00:43:40,481 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-10 00:43:40,481 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-10 00:43:40,481 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-10 00:43:40,481 [ scc.merge] INFO Previously merged:
2025-04-10 00:43:40,481 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-10 00:43:40,481 [ scc.merge] INFO
2025-04-10 00:43:40,481 [ scc.merge] INFO Merged PRs:
2025-04-10 00:43:40,481 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-10 00:43:40,481 [ scc.merge] INFO
2025-04-10 00:43:40,481 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-10 00:43:40,481 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-10 00:43:40,481 [ scc.merge] INFO
2025-04-10 00:43:40,481 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-10 00:43:40,481 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-10 00:43:40,483 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-10 00:43:40,485 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-10 00:43:40,488 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-10 00:43:40,490 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-10 00:43:40,492 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-10 00:43:40,494 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-10 00:43:40,496 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-10 00:43:40,499 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-10 00:43:40,501 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-10 00:43:40,503 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-10 00:43:40,505 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-10 00:43:40,508 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-10 00:43:40,510 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-10 00:43:40,512 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-10 00:43:40,514 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-10 00:43:40,516 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-10 00:43:40,519 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-10 00:43:40,521 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-10 00:43:40,523 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-10 00:43:40,525 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-10 00:43:40,527 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-10 00:43:40,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-10 00:43:40,530 [ scc.git] DEBUG Calling 'git remote'
2025-04-10 00:43:40,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD e5d9a1f] 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 9b2abda] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-10 00:44:27,665 [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-04-10 00:44:36,964 [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-04-10 00:44:39,390 [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-04-10 00:44:44,210 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-10 00:45:23,572 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
