Skipping 225 KB..
Full Log2025-04-11 00:44:47,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:47,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-11 00:44:47,551 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-11 00:44:47,551 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-11 00:44:47,552 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:44:47,552 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:44:47,555 [ scc.git] DEBUG Calling 'git reset --hard f579198bb5c1f0a6f9fc67512e763c3aa9a4c321'
2025-04-11 00:44:47,562 [ scc.git] DEBUG HEAD is now at f579198 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-11 00:44:47,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:47,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:44:47,930 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-11 00:44:47,933 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-11 00:44:47,936 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-11 00:44:47,938 [ scc.config] DEBUG Found github.token
2025-04-11 00:44:47,938 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-11 00:44:47,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-11 00:44:47,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:47,947 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-11 00:44:47,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:44:47,967 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-11 00:44:47,967 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-11 00:44:48,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:48,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:44:48,406 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:44:48,446 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:44:48,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:48,448 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:44:48,486 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:44:48,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff1cb110> has no local changes
2025-04-11 00:44:48,493 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:44:48,500 [ scc.git] DEBUG [detached HEAD 1c5d5f0] merge master -Dorg -Ssuccess-only
2025-04-11 00:44:48,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:44:48,500 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:44:48,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:48,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-11 00:44:49,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:49,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-11 00:44:49,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:49,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-11 00:44:50,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:50,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:44:50,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:50,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-11 00:44:51,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:51,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:44:51,335 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:44:51,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:51,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-11 00:44:52,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:52,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-11 00:44:52,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:52,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-11 00:44:53,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:53,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:44:53,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:53,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-11 00:44:54,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:54,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:44:54,306 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-11 00:44:54,306 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:44:54,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-11 00:44:54,306 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:44:54,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:54,309 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:44:54,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:44:54,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:44:54,314 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:44:54,318 [ scc.git] DEBUG Already up to date.
2025-04-11 00:44:54,318 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-11 00:44:54,611 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-11 00:44:54,611 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-11 00:44:54,615 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-11 00:44:54,878 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-11 00:44:54,878 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-11 00:44:54,882 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:44:54,882 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:44:54,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:54,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-11 00:44:54,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:54,891 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-11 00:44:54,900 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:44:54,904 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-11 00:44:54,904 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-11 00:44:54,904 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-11 00:44:54,904 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-11 00:44:54,904 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-11 00:44:54,904 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-11 00:44:54,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:55,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:44:55,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-11 00:44:55,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:55,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-11 00:44:55,081 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:44:55,084 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-11 00:44:55,084 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-11 00:44:55,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:55,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:44:55,503 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:44:55,542 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:44:55,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:44:55,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:44:55,581 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:44:55,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff18d990> has no local changes
2025-04-11 00:44:55,585 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:44:55,593 [ scc.git] DEBUG [detached HEAD 2878153] merge master -Dorg -Ssuccess-only
2025-04-11 00:44:55,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:44:55,593 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:44:55,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:56,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-11 00:44:56,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:56,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-11 00:44:56,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:56,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-11 00:44:57,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:57,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-11 00:44:57,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:58,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:44:58,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:58,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-11 00:44:58,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:58,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:44:58,888 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-11 00:44:59,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:59,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-11 00:44:59,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:44:59,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-11 00:45:00,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:00,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-11 00:45:00,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:00,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:01,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:01,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-11 00:45:01,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:01,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:01,930 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-11 00:45:01,930 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:01,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-11 00:45:01,930 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:01,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:01,933 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:01,935 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:01,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:01,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:01,946 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-11 00:45:02,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:02,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-11 00:45:02,622 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-11 00:45:02,900 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-11 00:45:02,900 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-11 00:45:02,904 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-11 00:45:03,186 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-11 00:45:03,186 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-11 00:45:03,191 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:03,191 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:03,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:03,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-11 00:45:03,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:03,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-11 00:45:03,213 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-11 00:45:03,213 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-11 00:45:03,213 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-11 00:45:03,213 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-11 00:45:03,213 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:03,213 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:03,216 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-11 00:45:03,220 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-11 00:45:03,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:03,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:03,392 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-11 00:45:03,397 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-11 00:45:03,400 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-11 00:45:03,403 [ scc.config] DEBUG Found github.token
2025-04-11 00:45:03,403 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-11 00:45:03,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-11 00:45:03,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:03,410 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-11 00:45:03,425 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-11 00:45:03,425 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-11 00:45:03,425 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-11 00:45:03,425 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:03,426 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:03,429 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-11 00:45:03,434 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-11 00:45:03,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:03,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:03,807 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-11 00:45:03,812 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-11 00:45:03,815 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-04-11 00:45:03,817 [ scc.config] DEBUG Found github.token
2025-04-11 00:45:03,817 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-11 00:45:03,817 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:03,855 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:03,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:03,857 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:03,895 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:03,899 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff1d2810> has no local changes
2025-04-11 00:45:03,899 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:03,907 [ scc.git] DEBUG [detached HEAD 53e6a33] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:03,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:03,907 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:04,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:04,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-11 00:45:04,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:04,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-11 00:45:05,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:05,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-11 00:45:05,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:05,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:06,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:06,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:06,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:06,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-11 00:45:07,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:07,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:07,381 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:45:07,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:07,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-11 00:45:07,893 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-11 00:45:08,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:08,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-11 00:45:08,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:09,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:09,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:09,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:09,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:10,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-11 00:45:10,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:10,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:10,589 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-11 00:45:10,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:11,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-11 00:45:11,103 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-11 00:45:11,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:11,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-11 00:45:11,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:12,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:12,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:12,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:12,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:13,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-11 00:45:13,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:13,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:13,691 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-11 00:45:13,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:14,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-11 00:45:14,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:14,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-11 00:45:14,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:15,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-11 00:45:15,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:15,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-11 00:45:15,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:16,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-11 00:45:16,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:16,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-11 00:45:16,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:17,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-11 00:45:17,267 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:17,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-11 00:45:17,267 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:17,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:17,270 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:17,273 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:17,273 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:17,276 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:17,279 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:17,279 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-11 00:45:17,556 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-11 00:45:17,556 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-11 00:45:17,560 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-11 00:45:17,851 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-11 00:45:17,851 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-11 00:45:17,856 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-11 00:45:18,113 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-11 00:45:18,113 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-11 00:45:18,117 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:18,117 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:18,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:18,120 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-11 00:45:18,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:18,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-11 00:45:18,134 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:45:18,137 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-11 00:45:18,137 [ scc.git] DEBUG package.json | 2 +-
2025-04-11 00:45:18,137 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-11 00:45:18,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:18,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:18,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-11 00:45:18,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:18,318 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-11 00:45:18,327 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-11 00:45:18,327 [ scc.git] DEBUG Auto-merging package.json
2025-04-11 00:45:18,328 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:45:18,332 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-11 00:45:18,332 [ scc.git] DEBUG package.json | 2 +-
2025-04-11 00:45:18,332 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-11 00:45:18,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:18,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:18,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-11 00:45:18,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:18,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-11 00:45:18,744 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:45:18,747 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-11 00:45:18,747 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-11 00:45:18,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:19,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:19,165 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:19,205 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:19,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:19,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:19,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:19,249 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff139750> has no local changes
2025-04-11 00:45:19,249 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:19,255 [ scc.git] DEBUG [detached HEAD 37b83d2] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:19,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:19,256 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:19,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:19,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-11 00:45:19,601 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:19,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-11 00:45:19,602 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:19,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:19,604 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:19,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:19,606 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:19,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:19,612 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:19,612 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:19,612 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:19,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:19,614 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:19,652 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:19,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:19,654 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:19,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:19,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc030fd0> has no local changes
2025-04-11 00:45:19,694 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:19,701 [ scc.git] DEBUG [detached HEAD cd4251c] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:19,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:19,701 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:19,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:20,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-11 00:45:20,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:20,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-11 00:45:20,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:21,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-11 00:45:21,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:21,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-11 00:45:21,598 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:21,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-11 00:45:21,598 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:21,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:21,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:21,603 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:21,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:21,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:21,610 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:21,610 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:21,610 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:21,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:21,612 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:21,651 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:21,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:21,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:21,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:21,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb501901b10> has no local changes
2025-04-11 00:45:21,694 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:21,700 [ scc.git] DEBUG [detached HEAD 21656e2] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:21,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:21,701 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:21,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:22,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-11 00:45:22,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:22,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-11 00:45:22,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:23,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-11 00:45:23,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:23,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-11 00:45:23,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:24,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:24,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:24,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-11 00:45:24,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:25,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:25,148 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-11 00:45:25,148 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:25,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-11 00:45:25,148 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:25,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:25,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:25,153 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:25,153 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:25,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:25,160 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:25,160 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-11 00:45:25,465 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-11 00:45:25,465 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-11 00:45:25,469 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:25,469 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:25,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:25,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-11 00:45:25,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:25,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-11 00:45:25,486 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG Auto-merging setup.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-11 00:45:25,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:25,487 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:25,489 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-11 00:45:25,493 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-11 00:45:25,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:25,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:25,663 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-11 00:45:25,667 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-11 00:45:25,670 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-04-11 00:45:25,672 [ scc.config] DEBUG Found github.token
2025-04-11 00:45:25,672 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-11 00:45:25,672 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:25,710 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:25,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:25,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:25,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:25,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc04cf90> has no local changes
2025-04-11 00:45:25,755 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:25,761 [ scc.git] DEBUG [detached HEAD 22ff411] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:25,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:25,762 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:25,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:26,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-11 00:45:26,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:26,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-11 00:45:26,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:27,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-11 00:45:27,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:27,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-11 00:45:27,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:28,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:28,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:28,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:28,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:29,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-11 00:45:29,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:29,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-11 00:45:29,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:30,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-11 00:45:30,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:30,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-11 00:45:30,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:31,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-11 00:45:31,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:31,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:31,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:32,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-11 00:45:32,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:32,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:32,547 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-11 00:45:32,547 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:32,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-11 00:45:32,547 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:32,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:32,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:32,552 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:32,552 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:32,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:32,558 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:32,559 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-11 00:45:32,865 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-11 00:45:32,865 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-11 00:45:32,869 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:32,869 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:32,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:32,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-11 00:45:32,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:32,878 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-11 00:45:32,890 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-11 00:45:32,894 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-11 00:45:32,895 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-11 00:45:32,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-11 00:45:32,896 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-11 00:45:32,896 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-11 00:45:32,896 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-11 00:45:32,897 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-11 00:45:33,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:33,053 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:33,091 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:33,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:33,094 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:33,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:33,136 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc05fa90> has no local changes
2025-04-11 00:45:33,136 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:33,142 [ scc.git] DEBUG [detached HEAD a489c34] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:33,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:33,143 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:33,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:33,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-11 00:45:33,503 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:33,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-11 00:45:33,503 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:33,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:33,506 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:33,508 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:33,508 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:33,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:33,514 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:33,514 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:33,514 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:33,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:33,516 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:33,554 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:33,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:33,556 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:33,593 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:33,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc053d50> has no local changes
2025-04-11 00:45:33,597 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:33,603 [ scc.git] DEBUG [detached HEAD f8241aa] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:33,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:33,603 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:33,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:34,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-11 00:45:34,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:34,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-11 00:45:34,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:34,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-11 00:45:35,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:35,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-11 00:45:35,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:36,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:36,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:36,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:36,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:37,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-11 00:45:37,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:37,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:37,494 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-11 00:45:37,494 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:37,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-11 00:45:37,494 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:37,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:37,497 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:37,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:37,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:37,502 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:37,505 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:37,505 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-11 00:45:37,793 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-11 00:45:37,793 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-11 00:45:37,797 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:37,797 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:37,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:37,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-11 00:45:37,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:37,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-11 00:45:37,813 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:45:37,816 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-11 00:45:37,816 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-11 00:45:37,816 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-11 00:45:37,816 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-11 00:45:37,816 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-11 00:45:37,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:37,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:37,994 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:38,033 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:38,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:38,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:38,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:38,077 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc084c50> has no local changes
2025-04-11 00:45:38,077 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:38,083 [ scc.git] DEBUG [detached HEAD 63ad45a] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:38,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:38,084 [ scc.git] INFO Overriding base-branch from master to main
2025-04-11 00:45:38,084 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:38,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:38,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-11 00:45:38,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:39,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-11 00:45:39,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:39,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-11 00:45:39,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:40,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-11 00:45:40,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:40,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:40,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:41,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:41,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:41,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-11 00:45:41,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:42,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-11 00:45:42,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:42,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-11 00:45:42,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:43,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-11 00:45:43,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:43,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:43,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:43,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-11 00:45:44,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:44,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:44,435 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-11 00:45:44,435 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:44,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-11 00:45:44,436 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:44,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:44,438 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-11 00:45:44,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:44,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-11 00:45:44,444 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-11 00:45:44,447 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:44,447 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-11 00:45:44,749 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-11 00:45:44,749 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-11 00:45:44,754 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:44,754 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:44,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:44,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-11 00:45:44,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:44,762 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-11 00:45:44,769 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-11 00:45:44,770 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-11 00:45:44,770 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:44,770 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:44,773 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-11 00:45:44,777 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-11 00:45:44,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:44,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:44,963 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-11 00:45:44,966 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-11 00:45:44,969 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-11 00:45:44,971 [ scc.config] DEBUG Found github.token
2025-04-11 00:45:44,971 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-11 00:45:44,972 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:45,010 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:45,050 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:45,055 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc06a790> has no local changes
2025-04-11 00:45:45,055 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:45,061 [ scc.git] DEBUG [detached HEAD e43c2fe] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:45,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:45,062 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:45,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:45,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-11 00:45:45,401 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:45,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-11 00:45:45,402 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,404 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:45,406 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:45,407 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:45,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:45,412 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:45,412 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:45,412 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,415 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:45,453 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:45,492 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:45,495 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff40cb50> has no local changes
2025-04-11 00:45:45,495 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:45,501 [ scc.git] DEBUG [detached HEAD c3041b2] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:45,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:45,502 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:45,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:45,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-11 00:45:45,843 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:45,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-11 00:45:45,843 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,845 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:45,847 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:45,847 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:45,850 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:45,853 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:45,853 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:45,853 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,856 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:45,893 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:45,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:45,896 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:45,933 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:45,937 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4fc03e010> has no local changes
2025-04-11 00:45:45,937 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:45,944 [ scc.git] DEBUG [detached HEAD 75d38f7] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:45,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:45,944 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:46,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:46,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-11 00:45:46,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:46,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-11 00:45:47,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:47,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-11 00:45:47,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:47,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-11 00:45:48,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:48,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:48,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:48,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-11 00:45:49,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:49,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:49,269 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-11 00:45:49,269 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:49,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-11 00:45:49,269 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:49,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:49,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-11 00:45:49,275 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:49,275 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-11 00:45:49,278 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-11 00:45:49,281 [ scc.git] DEBUG Already up to date.
2025-04-11 00:45:49,281 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-11 00:45:49,569 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-11 00:45:49,569 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-11 00:45:49,573 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:49,573 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:49,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:49,575 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-11 00:45:49,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:49,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-11 00:45:49,589 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-11 00:45:49,589 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-11 00:45:49,589 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:49,589 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:49,593 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-11 00:45:49,598 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-11 00:45:49,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:49,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:45:49,760 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-11 00:45:49,763 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-11 00:45:49,766 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-11 00:45:49,768 [ scc.config] DEBUG Found github.token
2025-04-11 00:45:49,768 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-11 00:45:49,768 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:45:49,807 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:49,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:49,809 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:45:49,848 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:45:49,852 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff4097d0> has no local changes
2025-04-11 00:45:49,852 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:45:49,858 [ scc.git] DEBUG [detached HEAD d93f6d0] merge master -Dorg -Ssuccess-only
2025-04-11 00:45:49,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:45:49,859 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-11 00:45:49,859 [ scc.repo] DEBUG ## PRs found:
2025-04-11 00:45:50,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:50,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-11 00:45:50,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:50,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-11 00:45:51,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-11 00:45:51,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:51,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-11 00:45:52,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:52,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:52,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:52,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-11 00:45:53,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:53,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-11 00:45:53,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:53,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:53,676 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-11 00:45:53,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:54,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-11 00:45:54,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:54,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-11 00:45:54,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:55,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-11 00:45:55,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:55,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-11 00:45:55,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:56,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-11 00:45:56,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:56,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-11 00:45:56,536 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-11 00:45:56,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:57,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-11 00:45:57,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:57,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-11 00:45:57,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:58,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-11 00:45:58,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:58,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-11 00:45:58,541 [ scc.repo] DEBUG ## Branches found:
2025-04-11 00:45:58,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-11 00:45:58,541 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:58,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:58,544 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-11 00:45:58,546 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-11 00:45:58,546 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-11 00:45:58,549 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-11 00:45:58,558 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-11 00:45:58,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:45:59,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-11 00:45:59,207 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-11 00:45:59,524 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-11 00:45:59,524 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-11 00:45:59,528 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-11 00:45:59,901 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-11 00:45:59,901 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-11 00:45:59,905 [ scc.git] DEBUG ## Unique users: []
2025-04-11 00:45:59,905 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:45:59,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:59,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-11 00:45:59,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:45:59,916 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-11 00:45:59,927 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-11 00:45:59,927 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-11 00:45:59,927 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-11 00:45:59,930 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-11 00:45:59,934 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-11 00:45:59,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:00,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:00,100 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-11 00:46:00,105 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-11 00:46:00,109 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#385](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-11 00:46:00,111 [ scc.config] DEBUG Found github.token
2025-04-11 00:46:00,112 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-11 00:46:00,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-11 00:46:00,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:46:00,118 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-11 00:46:00,128 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-11 00:46:00,131 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-11 00:46:00,131 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-11 00:46:00,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:00,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:00,509 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-11 00:46:00,548 [ scc.git] DEBUG Get sha1 of %s
2025-04-11 00:46:00,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-11 00:46:00,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:46:00,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:46:00,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb4ff221250> has no local changes
2025-04-11 00:46:00,591 [ 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#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:46:00,598 [ scc.git] DEBUG [detached HEAD 9a546f8] merge master -Dorg -Ssuccess-only
2025-04-11 00:46:00,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:00,598 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-11 00:46:00,671 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-11 00:46:00,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:00,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:00,925 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-11 00:46:00,927 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-11 00:46:01,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:01,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:01,333 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-11 00:46:01,335 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-11 00:46:01,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:01,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:01,747 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-11 00:46:01,749 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-11 00:46:01,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:02,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:02,160 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-11 00:46:02,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:02,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:02,570 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-11 00:46:02,572 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-11 00:46:02,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:02,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:02,996 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-11 00:46:02,998 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-11 00:46:03,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:03,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:03,423 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-11 00:46:03,425 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-11 00:46:03,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:03,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:03,945 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-11 00:46:03,947 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-11 00:46:04,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:04,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:04,353 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-11 00:46:04,356 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-11 00:46:04,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:04,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:04,768 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-11 00:46:04,770 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-11 00:46:05,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:05,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:05,177 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-11 00:46:05,179 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-11 00:46:05,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:05,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:05,586 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-11 00:46:05,589 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-11 00:46:05,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:05,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:06,005 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-11 00:46:06,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:06,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:06,433 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-11 00:46:06,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:06,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:06,857 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-11 00:46:06,859 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-11 00:46:07,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:07,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:07,275 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-11 00:46:07,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:07,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:07,702 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-11 00:46:07,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:08,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:08,101 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-11 00:46:08,103 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-11 00:46:08,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:08,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:08,529 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-11 00:46:08,531 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-11 00:46:08,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:08,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:08,936 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-11 00:46:08,938 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-11 00:46:09,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:09,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:09,351 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-11 00:46:09,353 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-11 00:46:09,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-11 00:46:09,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-11 00:46:09,766 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-11 00:46:09,766 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-11 00:46:09,854 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5017f5c10> has local changes
2025-04-11 00:46:09,854 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- 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 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#385 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/385/)'
2025-04-11 00:46:09,868 [ scc.git] DEBUG [detached HEAD 9fa41bd] merge master -Dorg -Ssuccess-only
2025-04-11 00:46:09,868 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-11 00:46:09,868 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-11 00:46:09,868 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,868 [ scc.merge] INFO
2025-04-11 00:46:09,868 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,868 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-11 00:46:09,868 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-11 00:46:09,868 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-11 00:46:09,868 [ scc.merge] INFO
2025-04-11 00:46:09,868 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-11 00:46:09,868 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,868 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-11 00:46:09,869 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-11 00:46:09,869 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-11 00:46:09,869 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-11 00:46:09,869 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-11 00:46:09,869 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-11 00:46:09,869 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-11 00:46:09,869 [ scc.merge] INFO Previously merged:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-11 00:46:09,869 [ scc.merge] INFO
2025-04-11 00:46:09,869 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-11 00:46:09,869 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,869 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-11 00:46:09,870 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-11 00:46:09,870 [ scc.merge] INFO Previously merged:
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-11 00:46:09,870 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-11 00:46:09,870 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-11 00:46:09,870 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-11 00:46:09,870 [ scc.merge] INFO
2025-04-11 00:46:09,870 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-11 00:46:09,871 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-11 00:46:09,871 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-11 00:46:09,871 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-11 00:46:09,871 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-11 00:46:09,871 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-11 00:46:09,871 [ scc.merge] INFO Previously merged:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-11 00:46:09,871 [ scc.merge] INFO
2025-04-11 00:46:09,871 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-11 00:46:09,871 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,871 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-11 00:46:09,872 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-11 00:46:09,872 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,872 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-11 00:46:09,872 [ scc.merge] INFO
2025-04-11 00:46:09,872 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-11 00:46:09,872 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-11 00:46:09,873 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-11 00:46:09,873 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-11 00:46:09,873 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-11 00:46:09,873 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-11 00:46:09,873 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-11 00:46:09,873 [ scc.merge] INFO Already up to date.
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,873 [ scc.merge] INFO Repository: ome/scripts
2025-04-11 00:46:09,873 [ scc.merge] INFO Excluded PRs:
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-11 00:46:09,873 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-11 00:46:09,873 [ scc.merge] INFO Previously merged:
2025-04-11 00:46:09,873 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-11 00:46:09,873 [ scc.merge] INFO
2025-04-11 00:46:09,874 [ scc.merge] INFO Merged PRs:
2025-04-11 00:46:09,874 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-11 00:46:09,874 [ scc.merge] INFO
2025-04-11 00:46:09,874 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-11 00:46:09,874 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-11 00:46:09,874 [ scc.merge] INFO
2025-04-11 00:46:09,874 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-11 00:46:09,874 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-11 00:46:09,876 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-11 00:46:09,878 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-11 00:46:09,880 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-11 00:46:09,883 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-11 00:46:09,885 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-11 00:46:09,887 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-11 00:46:09,889 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-11 00:46:09,891 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-11 00:46:09,893 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-11 00:46:09,896 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-11 00:46:09,898 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-11 00:46:09,900 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-11 00:46:09,902 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-11 00:46:09,904 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-11 00:46:09,906 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-11 00:46:09,909 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-11 00:46:09,911 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-11 00:46:09,913 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-11 00:46:09,915 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-11 00:46:09,917 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-11 00:46:09,919 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-11 00:46:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-11 00:46:09,922 [ scc.git] DEBUG Calling 'git remote'
2025-04-11 00:46:09,924 [ 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 b15ed21] 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 0e836ad] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-11 00:46:57,108 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-04-11 00:47:06,490 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-04-11 00:47:09,039 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-11 00:47:13,906 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-11 00:47:53,653 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
