Skipping 214 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-05-28 00:57:21,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:21,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-28 00:57:21,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:21,140 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-28 00:57:21,307 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-28 00:57:21,307 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-28 00:57:21,307 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:57:21,308 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:57:21,311 [ scc.git] DEBUG Calling 'git reset --hard 96cacd01c0cc9302c1c0556b7bcb94a7b0faa056'
2025-05-28 00:57:21,318 [ scc.git] DEBUG HEAD is now at 96cacd0 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-05-28 00:57:21,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:21,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:21,542 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-28 00:57:21,545 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-05-28 00:57:21,548 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-05-28 00:57:21,550 [ scc.config] DEBUG Found github.token
2025-05-28 00:57:21,550 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-05-28 00:57:21,550 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:21,589 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:21,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:21,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:21,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:21,635 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577f18810> has no local changes
2025-05-28 00:57:21,635 [ 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)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:21,644 [ scc.git] DEBUG [detached HEAD 64ad209] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:21,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:21,645 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:21,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:22,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-28 00:57:22,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:22,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-28 00:57:22,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:23,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-28 00:57:23,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:23,545 [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-05-28 00:57:23,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:24,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-28 00:57:24,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:24,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:24,527 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:57:24,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:25,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-28 00:57:25,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:25,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-28 00:57:25,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:26,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-28 00:57:26,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:26,631 [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-05-28 00:57:26,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-28 00:57:27,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:27,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:27,602 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-28 00:57:27,602 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:27,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-28 00:57:27,602 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:27,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:27,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:27,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:27,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:27,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:27,613 [ scc.git] DEBUG Already up to date.
2025-05-28 00:57:27,613 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-28 00:57:28,258 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-28 00:57:28,258 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-28 00:57:28,262 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-28 00:57:28,605 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-28 00:57:28,605 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-28 00:57:28,609 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:57:28,609 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:28,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:28,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-28 00:57:28,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:28,618 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-28 00:57:28,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:57:28,677 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-28 00:57:28,677 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-28 00:57:28,677 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-28 00:57:28,677 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-28 00:57:28,677 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-28 00:57:28,677 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-28 00:57:28,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:28,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:28,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-28 00:57:28,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:28,856 [ 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-05-28 00:57:28,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:57:28,868 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-28 00:57:28,868 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-28 00:57:29,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:29,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:29,258 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:29,296 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:29,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:29,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:29,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:29,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577f087d0> has no local changes
2025-05-28 00:57:29,339 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:29,345 [ scc.git] DEBUG [detached HEAD 9fea29d] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:29,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:29,346 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:29,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:29,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-28 00:57:30,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:30,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-28 00:57:30,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:30,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-28 00:57:31,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:31,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-28 00:57:31,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:31,847 [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-05-28 00:57:32,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:32,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-28 00:57:32,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:32,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:32,732 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-28 00:57:32,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:33,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-28 00:57:33,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:33,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-28 00:57:33,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:34,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-28 00:57:34,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:34,710 [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-05-28 00:57:34,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:35,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-28 00:57:35,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:35,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:35,596 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-28 00:57:35,596 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:35,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-28 00:57:35,596 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:35,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:35,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:35,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:35,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:35,604 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:35,612 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-28 00:57:35,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-28 00:57:36,245 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-28 00:57:37,113 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-28 00:57:37,113 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-28 00:57:37,118 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-28 00:57:37,569 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-28 00:57:37,569 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-28 00:57:37,573 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:57:37,573 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:37,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:37,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-28 00:57:37,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:37,582 [ 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-05-28 00:57:37,683 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-28 00:57:37,683 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-28 00:57:37,683 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-28 00:57:37,683 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-28 00:57:37,683 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:57:37,684 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:57:37,686 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-28 00:57:37,691 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-28 00:57:37,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:37,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:37,871 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-28 00:57:37,875 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-28 00:57:37,878 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-28 00:57:37,880 [ scc.config] DEBUG Found github.token
2025-05-28 00:57:37,880 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-28 00:57:37,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-28 00:57:37,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:37,887 [ 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-05-28 00:57:37,950 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-28 00:57:37,950 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-28 00:57:37,950 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-28 00:57:37,950 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:57:37,950 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:57:37,953 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-28 00:57:37,958 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-28 00:57:38,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:38,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:38,281 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-28 00:57:38,285 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-28 00:57:38,288 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/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-05-28 00:57:38,290 [ scc.config] DEBUG Found github.token
2025-05-28 00:57:38,290 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-28 00:57:38,290 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:38,328 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:38,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:38,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:38,368 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:38,372 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7574ce3ed0> has no local changes
2025-05-28 00:57:38,372 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:38,379 [ scc.git] DEBUG [detached HEAD 0028889] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:38,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:38,379 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:38,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:38,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-28 00:57:39,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:39,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-28 00:57:39,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:39,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-28 00:57:40,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:40,359 [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-05-28 00:57:40,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:40,836 [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-05-28 00:57:41,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:41,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-28 00:57:41,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:41,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:41,778 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:57:42,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:42,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-28 00:57:42,259 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-28 00:57:42,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:42,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-28 00:57:43,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:43,349 [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-05-28 00:57:43,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:43,834 [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-05-28 00:57:44,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:44,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-28 00:57:44,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:44,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:44,866 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-28 00:57:45,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:45,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-28 00:57:45,348 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-28 00:57:45,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:45,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-28 00:57:46,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:46,405 [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-05-28 00:57:46,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:46,927 [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-05-28 00:57:47,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:47,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-28 00:57:47,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:47,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:47,930 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-28 00:57:48,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:48,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-28 00:57:48,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:48,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-28 00:57:49,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:49,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-28 00:57:49,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:49,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-28 00:57:50,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:50,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-28 00:57:50,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:50,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-28 00:57:51,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:51,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-28 00:57:51,501 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:51,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-28 00:57:51,502 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:51,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:51,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:51,507 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:51,507 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:51,510 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:51,513 [ scc.git] DEBUG Already up to date.
2025-05-28 00:57:51,513 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-28 00:57:51,816 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-28 00:57:51,817 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-28 00:57:51,821 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-28 00:57:52,102 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-28 00:57:52,102 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-28 00:57:52,106 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-28 00:57:52,407 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-28 00:57:52,407 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-28 00:57:52,411 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:57:52,411 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:52,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:52,413 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-28 00:57:52,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:52,445 [ 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-05-28 00:57:52,467 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:57:52,470 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-28 00:57:52,471 [ scc.git] DEBUG package.json | 2 +-
2025-05-28 00:57:52,471 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-28 00:57:52,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:52,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:52,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-28 00:57:52,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:52,676 [ 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-05-28 00:57:52,754 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-28 00:57:52,754 [ scc.git] DEBUG Auto-merging package.json
2025-05-28 00:57:52,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:57:52,758 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-28 00:57:52,759 [ scc.git] DEBUG package.json | 2 +-
2025-05-28 00:57:52,759 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-28 00:57:52,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:53,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:53,093 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-28 00:57:53,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:53,098 [ 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-05-28 00:57:53,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:57:53,109 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-28 00:57:53,109 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-28 00:57:53,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:53,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:57:53,515 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:53,553 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:53,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:53,556 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:53,592 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:53,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577f08810> has no local changes
2025-05-28 00:57:53,596 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:53,603 [ scc.git] DEBUG [detached HEAD 2727049] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:53,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:53,603 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:53,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:53,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-28 00:57:53,984 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:53,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-28 00:57:53,984 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:53,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:53,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:53,989 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:53,989 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:53,991 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:53,994 [ scc.git] DEBUG Already up to date.
2025-05-28 00:57:53,994 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:57:53,995 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:53,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:53,997 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:54,035 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:54,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:54,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:54,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:54,077 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577ef5bd0> has no local changes
2025-05-28 00:57:54,077 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:54,083 [ scc.git] DEBUG [detached HEAD 7339897] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:54,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:54,083 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:54,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:54,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-28 00:57:54,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:55,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-28 00:57:55,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:55,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-28 00:57:55,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:55,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-28 00:57:55,994 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:55,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-28 00:57:55,994 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:55,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:55,997 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:55,999 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:55,999 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:56,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:56,005 [ scc.git] DEBUG Already up to date.
2025-05-28 00:57:56,005 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:57:56,005 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:56,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:56,007 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:57:56,045 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:56,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:56,047 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:57:56,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:57:56,087 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7574ce2510> has no local changes
2025-05-28 00:57:56,087 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:57:56,093 [ scc.git] DEBUG [detached HEAD 9d3963f] merge master -Dorg -Ssuccess-only
2025-05-28 00:57:56,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:57:56,094 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:57:56,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:56,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-28 00:57:56,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:57,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-28 00:57:57,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:57,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-28 00:57:57,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:58,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-28 00:57:58,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:58,637 [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-05-28 00:57:58,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:59,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-28 00:57:59,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:57:59,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:57:59,563 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-28 00:57:59,563 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:57:59,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-28 00:57:59,563 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:57:59,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:57:59,566 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:57:59,568 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:57:59,568 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:57:59,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:57:59,574 [ scc.git] DEBUG Already up to date.
2025-05-28 00:57:59,574 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-28 00:58:00,092 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-28 00:58:00,092 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-28 00:58:00,097 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:00,097 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:00,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:00,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-28 00:58:00,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:00,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-28 00:58:00,287 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG Auto-merging setup.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-28 00:58:00,287 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:58:00,287 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:58:00,290 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-28 00:58:00,294 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-28 00:58:00,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:00,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:00,469 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-28 00:58:00,472 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-28 00:58:00,475 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-05-28 00:58:00,477 [ scc.config] DEBUG Found github.token
2025-05-28 00:58:00,477 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-28 00:58:00,478 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:00,517 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:00,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:00,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:00,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:00,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7574cebd10> has no local changes
2025-05-28 00:58:00,560 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:00,566 [ scc.git] DEBUG [detached HEAD 4c10d18] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:00,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:00,566 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:00,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:01,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-28 00:58:01,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:01,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-28 00:58:01,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:02,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-28 00:58:02,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:02,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-28 00:58:02,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:03,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-28 00:58:03,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:03,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-28 00:58:03,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:03,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:58:03,996 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-28 00:58:04,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:04,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-28 00:58:04,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:04,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-28 00:58:05,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:05,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-28 00:58:05,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:05,984 [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-05-28 00:58:06,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:06,503 [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-05-28 00:58:06,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:06,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-28 00:58:07,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:07,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-28 00:58:07,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:07,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-28 00:58:08,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:08,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-28 00:58:08,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:08,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-28 00:58:09,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:09,459 [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-05-28 00:58:09,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:09,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-28 00:58:10,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:10,341 [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-05-28 00:58:10,342 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-28 00:58:10,342 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:10,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-28 00:58:10,342 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:10,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:10,345 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:10,347 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:10,347 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:10,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:10,353 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:10,353 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-28 00:58:10,717 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-28 00:58:10,717 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-28 00:58:10,721 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-28 00:58:11,061 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-28 00:58:11,061 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-28 00:58:11,065 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:11,065 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:11,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:11,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-28 00:58:11,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:11,073 [ 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-05-28 00:58:11,146 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-28 00:58:11,150 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-28 00:58:11,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:11,151 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-28 00:58:11,151 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-28 00:58:11,151 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-28 00:58:11,151 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-28 00:58:11,152 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-28 00:58:11,152 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-28 00:58:11,152 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-28 00:58:11,153 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-28 00:58:11,153 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-28 00:58:11,153 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-28 00:58:11,153 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-28 00:58:11,153 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-28 00:58:11,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:11,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-28 00:58:11,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:11,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-28 00:58:11,331 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:58:11,334 [ scc.git] DEBUG docker | 1 +
2025-05-28 00:58:11,334 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-28 00:58:11,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:11,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:11,739 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:11,777 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:11,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:11,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:11,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:11,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577ec1dd0> has no local changes
2025-05-28 00:58:11,821 [ 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'
- PR 76 will-moore 'Run cli deps'
Generated by OMERO-plugins-push#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:11,828 [ scc.git] DEBUG [detached HEAD b43bf43] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:11,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:11,828 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:11,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:12,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-28 00:58:12,172 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:12,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-28 00:58:12,172 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:12,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:12,174 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:12,176 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:12,176 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:12,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:12,182 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:12,182 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:12,182 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:12,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:12,184 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:12,222 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:12,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:12,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:12,262 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:12,265 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7574d73e10> has no local changes
2025-05-28 00:58:12,265 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:12,271 [ scc.git] DEBUG [detached HEAD 120bc74] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:12,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:12,272 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:12,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:12,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-05-28 00:58:12,643 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:12,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-28 00:58:12,643 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:12,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:12,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:12,648 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:12,648 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:12,651 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:12,659 [ scc.git] DEBUG Updating deab817..160d894
2025-05-28 00:58:12,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:13,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-05-28 00:58:13,349 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:13,349 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:13,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:13,351 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:13,389 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:13,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:13,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:13,429 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:13,433 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7579c6abd0> has no local changes
2025-05-28 00:58:13,433 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:13,439 [ scc.git] DEBUG [detached HEAD a0c441b] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:13,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:13,439 [ scc.git] INFO Overriding base-branch from master to main
2025-05-28 00:58:13,439 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:13,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:13,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-28 00:58:14,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:14,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-28 00:58:14,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:14,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-28 00:58:15,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:15,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-28 00:58:15,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:15,889 [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-05-28 00:58:16,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:16,383 [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-05-28 00:58:16,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:16,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-28 00:58:17,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:17,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-28 00:58:17,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:17,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-28 00:58:18,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:18,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-28 00:58:18,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:18,917 [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-05-28 00:58:19,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:19,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-28 00:58:19,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:19,909 [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-05-28 00:58:19,909 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-28 00:58:19,909 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:19,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-28 00:58:19,910 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:19,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:19,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-28 00:58:19,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:19,915 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-28 00:58:19,917 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-28 00:58:19,920 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:19,920 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-28 00:58:20,402 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-28 00:58:20,402 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-28 00:58:20,406 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:20,406 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:20,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:20,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-28 00:58:20,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:20,414 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-28 00:58:20,542 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-28 00:58:20,542 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-28 00:58:20,542 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:58:20,543 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:58:20,545 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-28 00:58:20,549 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-28 00:58:20,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:20,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:20,718 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-28 00:58:20,721 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-28 00:58:20,723 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-28 00:58:20,726 [ scc.config] DEBUG Found github.token
2025-05-28 00:58:20,726 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-28 00:58:20,726 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:20,765 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:20,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:20,767 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:20,803 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:20,806 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7574d4af50> has no local changes
2025-05-28 00:58:20,806 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:20,813 [ scc.git] DEBUG [detached HEAD 553c28b] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:20,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:20,813 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:20,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:21,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-28 00:58:21,167 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:21,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-28 00:58:21,167 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:21,172 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:21,172 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:21,174 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:21,177 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:21,177 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:21,177 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,180 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:21,218 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,220 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:21,258 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:21,261 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577f19a50> has no local changes
2025-05-28 00:58:21,261 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:21,268 [ scc.git] DEBUG [detached HEAD d30962d] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:21,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:21,268 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:21,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:21,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-28 00:58:21,603 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:21,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-28 00:58:21,603 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:21,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:21,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:21,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:21,613 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:21,613 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:21,613 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,615 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:21,653 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:21,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:21,655 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:21,692 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:21,695 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577f24350> has no local changes
2025-05-28 00:58:21,695 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:21,701 [ scc.git] DEBUG [detached HEAD f48255d] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:21,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:21,702 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:21,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:22,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-28 00:58:22,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:22,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-28 00:58:22,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:23,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-28 00:58:23,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:23,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-28 00:58:23,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:24,085 [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-05-28 00:58:24,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:24,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-28 00:58:24,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:24,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:58:24,982 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-28 00:58:24,983 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:24,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-28 00:58:24,983 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:24,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:24,985 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-28 00:58:24,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:24,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-28 00:58:24,990 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-28 00:58:24,994 [ scc.git] DEBUG Already up to date.
2025-05-28 00:58:24,994 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-28 00:58:25,457 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-28 00:58:25,457 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-28 00:58:25,461 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:25,461 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:25,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:25,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-28 00:58:25,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:25,469 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-28 00:58:25,585 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-28 00:58:25,585 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-28 00:58:25,586 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:58:25,586 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:58:25,589 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-28 00:58:25,594 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-28 00:58:25,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:25,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:25,766 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-28 00:58:25,768 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-28 00:58:25,771 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-28 00:58:25,773 [ scc.config] DEBUG Found github.token
2025-05-28 00:58:25,773 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-28 00:58:25,773 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:25,812 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:25,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:25,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:25,851 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:25,854 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577ef4b50> has no local changes
2025-05-28 00:58:25,855 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:25,861 [ scc.git] DEBUG [detached HEAD 37b43d1] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:25,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:25,862 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-28 00:58:25,862 [ scc.repo] DEBUG ## PRs found:
2025-05-28 00:58:26,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:26,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-28 00:58:26,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:26,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-28 00:58:27,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:27,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-28 00:58:27,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:27,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-28 00:58:27,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:28,231 [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-05-28 00:58:28,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:28,712 [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-05-28 00:58:28,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:29,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-28 00:58:29,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:29,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:58:29,666 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-28 00:58:29,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:30,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-28 00:58:30,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:30,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-28 00:58:30,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:31,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-28 00:58:31,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:31,576 [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-05-28 00:58:31,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:32,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-28 00:58:32,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:32,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-28 00:58:32,550 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-28 00:58:32,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:33,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-28 00:58:33,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:33,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-28 00:58:33,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:34,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-28 00:58:34,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:34,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-28 00:58:34,640 [ scc.repo] DEBUG ## Branches found:
2025-05-28 00:58:34,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-28 00:58:34,640 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:34,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:34,643 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-28 00:58:34,645 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-28 00:58:34,645 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-28 00:58:34,648 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-28 00:58:34,656 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-28 00:58:34,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:35,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-28 00:58:35,289 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-28 00:58:35,912 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-28 00:58:35,912 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-28 00:58:35,916 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-28 00:58:36,406 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-28 00:58:36,406 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-28 00:58:36,410 [ scc.git] DEBUG ## Unique users: []
2025-05-28 00:58:36,410 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:36,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:36,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-28 00:58:36,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:36,420 [ 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-05-28 00:58:36,503 [ 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-05-28 00:58:36,504 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-28 00:58:36,504 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-28 00:58:36,506 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-28 00:58:36,510 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-28 00:58:36,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:36,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:36,671 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-28 00:58:36,676 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-28 00:58:36,680 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#436](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-28 00:58:36,682 [ scc.config] DEBUG Found github.token
2025-05-28 00:58:36,682 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-28 00:58:36,682 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-28 00:58:36,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:36,691 [ 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-05-28 00:58:36,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-28 00:58:36,704 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-28 00:58:36,704 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-28 00:58:36,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:37,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:37,085 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-28 00:58:37,124 [ scc.git] DEBUG Get sha1 of %s
2025-05-28 00:58:37,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-28 00:58:37,126 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:37,164 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:37,167 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7577ef5950> has no local changes
2025-05-28 00:58:37,168 [ 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:37,174 [ scc.git] DEBUG [detached HEAD 45e5e1e] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:37,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:37,174 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-28 00:58:37,250 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-28 00:58:37,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:37,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:37,500 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-28 00:58:37,502 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-28 00:58:37,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:37,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:37,937 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-28 00:58:37,939 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-28 00:58:38,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:38,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:38,345 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-28 00:58:38,347 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-28 00:58:38,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:38,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:38,750 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-28 00:58:38,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:39,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:39,173 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-28 00:58:39,175 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-28 00:58:39,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:39,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:39,581 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-28 00:58:39,583 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-28 00:58:39,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:39,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:39,996 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-28 00:58:39,999 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-28 00:58:40,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:40,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:40,529 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-28 00:58:40,531 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-28 00:58:40,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:40,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:40,951 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-28 00:58:40,954 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-28 00:58:41,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:41,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:41,359 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-28 00:58:41,361 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-28 00:58:41,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:41,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:41,760 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-28 00:58:41,762 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-28 00:58:42,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:42,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:42,177 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-28 00:58:42,179 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-28 00:58:42,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:42,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:42,591 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-28 00:58:42,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:43,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:43,081 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-28 00:58:43,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:43,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:43,480 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-28 00:58:43,482 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-28 00:58:43,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:43,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:43,899 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-28 00:58:44,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:44,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:44,316 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-28 00:58:44,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:44,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:44,729 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-28 00:58:44,731 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-28 00:58:44,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:45,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:45,135 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-28 00:58:45,138 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-28 00:58:45,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:45,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:45,554 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-28 00:58:45,556 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-28 00:58:45,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:45,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:45,966 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-28 00:58:45,969 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-28 00:58:46,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-28 00:58:46,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-28 00:58:46,375 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-28 00:58:46,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-28 00:58:46,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7578fa57d0> has local changes
2025-05-28 00:58:46,464 [ 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'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- 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'
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 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
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)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- 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'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- 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#436 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/436/)'
2025-05-28 00:58:46,481 [ scc.git] DEBUG [detached HEAD a22799e] merge master -Dorg -Ssuccess-only
2025-05-28 00:58:46,481 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-28 00:58:46,481 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-28 00:58:46,481 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,481 [ scc.merge] INFO
2025-05-28 00:58:46,481 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,481 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-28 00:58:46,481 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-28 00:58:46,482 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-28 00:58:46,482 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-28 00:58:46,482 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-28 00:58:46,482 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-28 00:58:46,482 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-28 00:58:46,482 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-28 00:58:46,482 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,482 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,482 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-28 00:58:46,482 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-28 00:58:46,483 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-28 00:58:46,483 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-28 00:58:46,483 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-28 00:58:46,483 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-28 00:58:46,483 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-28 00:58:46,483 [ scc.merge] INFO
2025-05-28 00:58:46,483 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-28 00:58:46,483 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-28 00:58:46,484 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-28 00:58:46,484 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-05-28 00:58:46,484 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-28 00:58:46,484 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-28 00:58:46,484 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-28 00:58:46,484 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-28 00:58:46,484 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-28 00:58:46,484 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-28 00:58:46,484 [ scc.merge] INFO
2025-05-28 00:58:46,484 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-28 00:58:46,485 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-28 00:58:46,485 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-28 00:58:46,485 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-28 00:58:46,485 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-28 00:58:46,485 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-28 00:58:46,485 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-28 00:58:46,485 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-28 00:58:46,485 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-28 00:58:46,485 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-28 00:58:46,485 [ scc.merge] INFO
2025-05-28 00:58:46,485 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-28 00:58:46,486 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-28 00:58:46,486 [ scc.merge] INFO Updating deab817..160d894
2025-05-28 00:58:46,486 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-28 00:58:46,486 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-28 00:58:46,486 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-28 00:58:46,486 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-28 00:58:46,486 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-28 00:58:46,486 [ scc.merge] INFO Already up to date.
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Repository: ome/scripts
2025-05-28 00:58:46,486 [ scc.merge] INFO Excluded PRs:
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-28 00:58:46,486 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-28 00:58:46,486 [ scc.merge] INFO Previously merged:
2025-05-28 00:58:46,486 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-28 00:58:46,486 [ scc.merge] INFO
2025-05-28 00:58:46,486 [ scc.merge] INFO Merged PRs:
2025-05-28 00:58:46,487 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-28 00:58:46,487 [ scc.merge] INFO
2025-05-28 00:58:46,487 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-28 00:58:46,487 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-28 00:58:46,487 [ scc.merge] INFO
2025-05-28 00:58:46,487 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-28 00:58:46,487 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-28 00:58:46,489 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-28 00:58:46,491 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-28 00:58:46,494 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-28 00:58:46,496 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-28 00:58:46,498 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-28 00:58:46,500 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-28 00:58:46,503 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-28 00:58:46,505 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-28 00:58:46,507 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-28 00:58:46,509 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-28 00:58:46,511 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-28 00:58:46,513 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-28 00:58:46,516 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-28 00:58:46,518 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-28 00:58:46,520 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-28 00:58:46,522 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-28 00:58:46,524 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-28 00:58:46,526 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-28 00:58:46,529 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-28 00:58:46,531 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-28 00:58:46,533 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-28 00:58:46,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-28 00:58:46,535 [ scc.git] DEBUG Calling 'git remote'
2025-05-28 00:58:46,537 [ 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 a9340af] 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 1e7c366] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-28 00:59:34,518 [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-05-28 00:59:44,067 [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-05-28 00:59:46,552 [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-05-28 00:59:51,357 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-28 01:00:31,448 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
