Skipping 228 KB..
Full Log2025-04-03 01:43:55,733 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-03 01:43:55,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:56,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:43:56,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-03 01:43:56,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:43:56,115 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-03 01:43:56,151 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-03 01:43:56,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-03 01:43:56,152 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:43:56,152 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:43:56,155 [ scc.git] DEBUG Calling 'git reset --hard 88313d714c371de8f7af41bce9fa0151e7dcd259'
2025-04-03 01:43:56,162 [ scc.git] DEBUG HEAD is now at 88313d7 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-03 01:43:56,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:56,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:43:56,528 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-03 01:43:56,531 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-03 01:43:56,534 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-03 01:43:56,536 [ scc.config] DEBUG Found github.token
2025-04-03 01:43:56,536 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-03 01:43:56,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-03 01:43:56,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:43:56,546 [ 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-03 01:43:56,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:43:56,566 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-03 01:43:56,566 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-03 01:43:56,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:56,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:43:56,955 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:43:56,996 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:43:56,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:43:56,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:43:57,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:43:57,043 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d9296d0> has no local changes
2025-04-03 01:43:57,043 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:43:57,050 [ scc.git] DEBUG [detached HEAD 490ac10] merge master -Dorg -Ssuccess-only
2025-04-03 01:43:57,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:43:57,050 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:43:57,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:57,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-03 01:43:57,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:58,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-03 01:43:58,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:58,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-03 01:43:58,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:59,080 [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-03 01:43:59,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:43:59,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-03 01:43:59,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:00,021 [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-03 01:44:00,022 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:44:00,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:00,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-03 01:44:00,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:01,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-03 01:44:01,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:01,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-03 01:44:01,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:02,085 [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-03 01:44:02,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:02,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-03 01:44:02,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:02,993 [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-03 01:44:02,993 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-03 01:44:02,993 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:02,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-03 01:44:02,993 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:02,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:02,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:02,999 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:02,999 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:03,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:03,005 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:03,005 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-03 01:44:03,287 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-03 01:44:03,288 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-03 01:44:03,292 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-03 01:44:03,564 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-03 01:44:03,565 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-03 01:44:03,570 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:03,570 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:03,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:03,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-03 01:44:03,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:03,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-03 01:44:03,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:03,591 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-03 01:44:03,591 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-03 01:44:03,591 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-03 01:44:03,591 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-03 01:44:03,591 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-03 01:44:03,591 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-03 01:44:03,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:03,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:03,767 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-03 01:44:03,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:03,773 [ 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-03 01:44:03,782 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:03,785 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-03 01:44:03,785 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-03 01:44:04,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:04,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:04,181 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:04,220 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:04,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:04,222 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:04,261 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:04,265 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d8cf150> has no local changes
2025-04-03 01:44:04,265 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:04,271 [ scc.git] DEBUG [detached HEAD ad490ac] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:04,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:04,272 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:04,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:04,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-03 01:44:05,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:05,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-03 01:44:05,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:05,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-03 01:44:06,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:06,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-03 01:44:06,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:06,769 [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-03 01:44:07,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:07,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-03 01:44:07,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:07,739 [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-03 01:44:07,739 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-03 01:44:07,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:08,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-03 01:44:08,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:08,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-03 01:44:08,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:09,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-03 01:44:09,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:09,717 [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-03 01:44:09,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:10,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-03 01:44:10,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:10,676 [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-03 01:44:10,676 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-03 01:44:10,676 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:10,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-03 01:44:10,677 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:10,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:10,680 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:10,682 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:10,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:10,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:10,692 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-03 01:44:10,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:11,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-03 01:44:11,330 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-03 01:44:11,612 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-03 01:44:11,612 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-03 01:44:11,616 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-03 01:44:11,871 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-03 01:44:11,871 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-03 01:44:11,875 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:11,875 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:11,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:11,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-03 01:44:11,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:11,884 [ 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-03 01:44:11,897 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-03 01:44:11,898 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-03 01:44:11,898 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-03 01:44:11,898 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-03 01:44:11,898 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:44:11,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:44:11,901 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-03 01:44:11,905 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-03 01:44:11,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:12,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:12,072 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-03 01:44:12,077 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-03 01:44:12,080 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-03 01:44:12,083 [ scc.config] DEBUG Found github.token
2025-04-03 01:44:12,083 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-03 01:44:12,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-03 01:44:12,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:12,089 [ 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-03 01:44:12,104 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-03 01:44:12,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-03 01:44:12,104 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-03 01:44:12,104 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:44:12,104 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:44:12,107 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-03 01:44:12,112 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-03 01:44:12,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:12,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:12,484 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-03 01:44:12,489 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-03 01:44:12,491 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/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-03 01:44:12,494 [ scc.config] DEBUG Found github.token
2025-04-03 01:44:12,494 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-03 01:44:12,494 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:12,532 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:12,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:12,534 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:12,573 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:12,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4db13810> has no local changes
2025-04-03 01:44:12,578 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:12,585 [ scc.git] DEBUG [detached HEAD 542c1d9] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:12,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:12,585 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:12,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:13,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-03 01:44:13,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:13,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-03 01:44:13,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:14,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-03 01:44:14,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:14,724 [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-03 01:44:14,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:15,212 [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-03 01:44:15,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:15,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-03 01:44:15,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:16,165 [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-03 01:44:16,165 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:44:16,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:16,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-03 01:44:16,641 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-03 01:44:16,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:17,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-03 01:44:17,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:17,714 [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-03 01:44:17,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:18,245 [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-03 01:44:18,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:18,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-03 01:44:19,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:19,205 [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-03 01:44:19,205 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-03 01:44:19,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:19,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-03 01:44:19,728 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-03 01:44:19,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:20,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-03 01:44:20,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:20,835 [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-03 01:44:21,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:21,375 [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-03 01:44:21,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:21,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-03 01:44:22,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:22,408 [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-03 01:44:22,409 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-03 01:44:22,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:22,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-03 01:44:23,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:23,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-03 01:44:23,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:23,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-03 01:44:24,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:24,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-03 01:44:24,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:24,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-03 01:44:25,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:25,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-03 01:44:25,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:25,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-03 01:44:25,863 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:25,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-03 01:44:25,863 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:25,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:25,866 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:25,868 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:25,869 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:25,872 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:25,875 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:25,875 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-03 01:44:26,147 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-03 01:44:26,147 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-03 01:44:26,151 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-03 01:44:26,446 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-03 01:44:26,446 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-03 01:44:26,450 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-03 01:44:26,729 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-03 01:44:26,729 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-03 01:44:26,733 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:26,733 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:26,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:26,735 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-03 01:44:26,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:26,740 [ 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-03 01:44:26,749 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:26,752 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-03 01:44:26,752 [ scc.git] DEBUG package.json | 2 +-
2025-04-03 01:44:26,752 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-03 01:44:26,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:26,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:26,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-03 01:44:26,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:26,936 [ 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-03 01:44:26,946 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-03 01:44:26,946 [ scc.git] DEBUG Auto-merging package.json
2025-04-03 01:44:26,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:26,950 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-03 01:44:26,950 [ scc.git] DEBUG package.json | 2 +-
2025-04-03 01:44:26,950 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-03 01:44:27,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:27,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:27,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-03 01:44:27,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:27,356 [ 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-03 01:44:27,364 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:27,367 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-03 01:44:27,367 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-03 01:44:27,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:27,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:27,754 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:27,793 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:27,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:27,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:27,832 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:27,836 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d83de50> has no local changes
2025-04-03 01:44:27,836 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:27,843 [ scc.git] DEBUG [detached HEAD ee1adc1] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:27,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:27,843 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:28,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:28,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-03 01:44:28,194 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:28,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-03 01:44:28,194 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:28,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:28,196 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:28,199 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:28,199 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:28,202 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:28,205 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:28,205 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:28,205 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:28,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:28,207 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:28,245 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:28,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:28,247 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:28,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:28,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d929b90> has no local changes
2025-04-03 01:44:28,286 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:28,292 [ scc.git] DEBUG [detached HEAD 37a4e1a] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:28,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:28,293 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:28,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:28,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-03 01:44:28,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:29,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-03 01:44:29,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:29,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-03 01:44:30,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:30,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-03 01:44:30,218 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:30,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-03 01:44:30,218 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:30,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:30,221 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:30,223 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:30,223 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:30,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:30,229 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:30,229 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:30,229 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:30,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:30,231 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:30,270 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:30,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:30,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:30,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:30,313 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a3f705f50> has no local changes
2025-04-03 01:44:30,313 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:30,320 [ scc.git] DEBUG [detached HEAD 856fa67] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:30,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:30,320 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:30,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:30,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-03 01:44:31,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:31,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-03 01:44:31,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:31,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-03 01:44:31,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:32,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-03 01:44:32,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:32,701 [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-03 01:44:32,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:33,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-03 01:44:33,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:33,604 [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-03 01:44:33,605 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-03 01:44:33,605 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:33,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-03 01:44:33,605 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:33,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:33,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:33,610 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:33,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:33,613 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:33,616 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:33,616 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-03 01:44:33,890 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-03 01:44:33,890 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-03 01:44:33,894 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:33,894 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:33,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:33,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-03 01:44:33,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:33,902 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-03 01:44:33,911 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-03 01:44:33,911 [ scc.git] DEBUG Auto-merging setup.py
2025-04-03 01:44:33,912 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-03 01:44:33,912 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:44:33,912 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:44:33,915 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-03 01:44:33,919 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-03 01:44:33,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:34,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:34,086 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-03 01:44:34,089 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-03 01:44:34,092 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-04-03 01:44:34,094 [ scc.config] DEBUG Found github.token
2025-04-03 01:44:34,094 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-03 01:44:34,094 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:34,132 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:34,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:34,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:34,171 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:34,175 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a3f73a150> has no local changes
2025-04-03 01:44:34,175 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:34,181 [ scc.git] DEBUG [detached HEAD dba4c18] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:34,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:34,181 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:34,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:34,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-03 01:44:34,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:35,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-03 01:44:35,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:35,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-03 01:44:35,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:36,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-03 01:44:36,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:36,668 [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-03 01:44:36,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:37,179 [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-03 01:44:37,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:37,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-03 01:44:37,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:38,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-03 01:44:38,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:38,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-03 01:44:38,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:39,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-03 01:44:39,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:39,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-03 01:44:39,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:40,083 [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-03 01:44:40,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:40,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-03 01:44:40,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:41,027 [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-03 01:44:41,028 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-03 01:44:41,028 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:41,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-03 01:44:41,028 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:41,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:41,031 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:41,033 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:41,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:41,036 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:41,039 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:41,039 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-03 01:44:41,355 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-03 01:44:41,355 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-03 01:44:41,360 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:41,360 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:41,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:41,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-03 01:44:41,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:41,369 [ 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-03 01:44:41,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-03 01:44:41,385 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-03 01:44:41,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-03 01:44:41,386 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-03 01:44:41,386 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-03 01:44:41,386 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-03 01:44:41,386 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-03 01:44:41,386 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-03 01:44:41,387 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-03 01:44:41,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:41,550 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:41,588 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:41,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:41,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:41,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:41,631 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d84bc50> has no local changes
2025-04-03 01:44:41,631 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:41,639 [ scc.git] DEBUG [detached HEAD 70b828b] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:41,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:41,639 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:41,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:41,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-03 01:44:41,999 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:41,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-03 01:44:41,999 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:41,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:42,001 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:42,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:42,004 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:42,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:42,009 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:42,010 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:42,010 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:42,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:42,012 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:42,049 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:42,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:42,052 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:42,088 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:42,091 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4dad3ad0> has no local changes
2025-04-03 01:44:42,091 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:42,097 [ scc.git] DEBUG [detached HEAD 7e455c7] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:42,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:42,098 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:42,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:42,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-03 01:44:42,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:43,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-03 01:44:43,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:43,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-03 01:44:43,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:44,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-03 01:44:44,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:44,640 [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-03 01:44:44,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:45,138 [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-03 01:44:45,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:45,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-03 01:44:45,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:46,077 [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-03 01:44:46,078 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-03 01:44:46,078 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:46,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-03 01:44:46,078 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:46,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:46,081 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:46,083 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:46,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:46,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:46,089 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:46,089 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-03 01:44:46,363 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-03 01:44:46,363 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-03 01:44:46,367 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:46,367 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:46,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:46,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-03 01:44:46,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:46,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-03 01:44:46,382 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:44:46,385 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-03 01:44:46,385 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-03 01:44:46,385 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-03 01:44:46,385 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-03 01:44:46,385 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-03 01:44:46,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:46,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:46,552 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:46,590 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:46,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:46,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:46,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:46,632 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a3f785d10> has no local changes
2025-04-03 01:44:46,632 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:46,639 [ scc.git] DEBUG [detached HEAD eacfda4] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:46,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:46,639 [ scc.git] INFO Overriding base-branch from master to main
2025-04-03 01:44:46,639 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:46,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:47,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-03 01:44:47,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:47,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-03 01:44:47,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:48,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-03 01:44:48,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:48,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-03 01:44:48,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:49,218 [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-03 01:44:49,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:49,729 [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-03 01:44:49,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:50,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-03 01:44:50,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:50,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-03 01:44:50,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:51,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-03 01:44:51,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:51,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-03 01:44:51,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:52,170 [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-03 01:44:52,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:52,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-03 01:44:52,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:53,117 [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-03 01:44:53,117 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-03 01:44:53,118 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:53,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-03 01:44:53,118 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:53,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:53,121 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-03 01:44:53,123 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:53,123 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-03 01:44:53,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-03 01:44:53,130 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:53,130 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-03 01:44:53,431 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-03 01:44:53,431 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-03 01:44:53,435 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:53,435 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:53,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:53,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-03 01:44:53,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:53,443 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-03 01:44:53,450 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-03 01:44:53,451 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-03 01:44:53,451 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:44:53,451 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:44:53,454 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-03 01:44:53,458 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-03 01:44:53,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:53,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:53,641 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-03 01:44:53,644 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-03 01:44:53,647 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-03 01:44:53,649 [ scc.config] DEBUG Found github.token
2025-04-03 01:44:53,649 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-03 01:44:53,649 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:53,688 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:53,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:53,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:53,727 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:53,731 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a3f748f90> has no local changes
2025-04-03 01:44:53,731 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:53,737 [ scc.git] DEBUG [detached HEAD 57b6534] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:53,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:53,737 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:53,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:54,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-03 01:44:54,082 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:54,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-03 01:44:54,082 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,084 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:54,087 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:54,087 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:54,090 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:54,092 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:54,092 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:54,092 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,095 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:54,132 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,135 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:54,171 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:54,174 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d86c1d0> has no local changes
2025-04-03 01:44:54,174 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:54,180 [ scc.git] DEBUG [detached HEAD 9e04232] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:54,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:54,181 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:54,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:54,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-03 01:44:54,522 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:54,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-03 01:44:54,522 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,525 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:54,527 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:54,527 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:54,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:54,533 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:54,533 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:54,533 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,535 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:54,573 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:54,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:54,575 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:54,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:54,615 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a3f781350> has no local changes
2025-04-03 01:44:54,615 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:54,621 [ scc.git] DEBUG [detached HEAD 0ee672a] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:54,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:54,622 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:54,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:55,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-03 01:44:55,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:55,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-03 01:44:55,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:55,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-03 01:44:56,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:56,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-03 01:44:56,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:57,001 [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-03 01:44:57,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:57,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-03 01:44:57,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:57,918 [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-03 01:44:57,919 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-03 01:44:57,919 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:44:57,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-03 01:44:57,919 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:57,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:57,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-03 01:44:57,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:44:57,924 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-03 01:44:57,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-03 01:44:57,930 [ scc.git] DEBUG Already up to date.
2025-04-03 01:44:57,930 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-03 01:44:58,204 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-03 01:44:58,204 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-03 01:44:58,208 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:44:58,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:58,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:58,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-03 01:44:58,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:58,216 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-03 01:44:58,225 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-03 01:44:58,225 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-03 01:44:58,225 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:44:58,225 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:44:58,228 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-03 01:44:58,233 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-03 01:44:58,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:58,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:44:58,401 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-03 01:44:58,404 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-03 01:44:58,407 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-03 01:44:58,409 [ scc.config] DEBUG Found github.token
2025-04-03 01:44:58,409 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-03 01:44:58,409 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:44:58,448 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:44:58,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:44:58,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:44:58,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:44:58,491 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d92b950> has no local changes
2025-04-03 01:44:58,491 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:44:58,497 [ scc.git] DEBUG [detached HEAD c5c9c79] merge master -Dorg -Ssuccess-only
2025-04-03 01:44:58,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:44:58,498 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-03 01:44:58,498 [ scc.repo] DEBUG ## PRs found:
2025-04-03 01:44:58,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:58,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-03 01:44:59,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:44:59,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-03 01:44:59,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:00,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-03 01:45:00,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:00,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-03 01:45:00,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:00,936 [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-03 01:45:01,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:01,409 [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-03 01:45:01,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:01,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-03 01:45:02,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:02,297 [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-03 01:45:02,297 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-03 01:45:02,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:02,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-03 01:45:03,039 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:03,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-03 01:45:03,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:03,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-03 01:45:03,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:04,185 [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-03 01:45:04,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:04,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-03 01:45:04,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:05,069 [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-03 01:45:05,069 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-03 01:45:05,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:05,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-03 01:45:05,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:06,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-03 01:45:06,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:06,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-03 01:45:06,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:07,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-03 01:45:07,132 [ scc.repo] DEBUG ## Branches found:
2025-04-03 01:45:07,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-03 01:45:07,132 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:45:07,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:45:07,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-03 01:45:07,138 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-03 01:45:07,138 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-03 01:45:07,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-03 01:45:07,151 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-03 01:45:07,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:07,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-03 01:45:07,820 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-03 01:45:08,105 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-03 01:45:08,105 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-03 01:45:08,109 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-03 01:45:08,416 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-03 01:45:08,416 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-03 01:45:08,420 [ scc.git] DEBUG ## Unique users: []
2025-04-03 01:45:08,420 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:45:08,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:45:08,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-03 01:45:08,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:45:08,431 [ 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-03 01:45:08,441 [ 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-03 01:45:08,442 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-03 01:45:08,442 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-03 01:45:08,445 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-03 01:45:08,448 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-03 01:45:08,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:08,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:08,636 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-03 01:45:08,641 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-03 01:45:08,645 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#376](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-03 01:45:08,647 [ scc.config] DEBUG Found github.token
2025-04-03 01:45:08,647 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-03 01:45:08,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-03 01:45:08,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:45:08,654 [ 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-03 01:45:08,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-03 01:45:08,666 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-03 01:45:08,666 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-03 01:45:08,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:09,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:09,046 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-03 01:45:09,085 [ scc.git] DEBUG Get sha1 of %s
2025-04-03 01:45:09,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-03 01:45:09,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:45:09,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:45:09,127 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d929610> has no local changes
2025-04-03 01:45:09,127 [ 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#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:45:09,134 [ scc.git] DEBUG [detached HEAD 63e67c2] merge master -Dorg -Ssuccess-only
2025-04-03 01:45:09,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:09,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-03 01:45:09,206 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-03 01:45:09,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:09,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:09,465 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-03 01:45:09,467 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-03 01:45:09,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:09,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:09,929 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-03 01:45:09,931 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-03 01:45:10,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:10,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:10,340 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-03 01:45:10,342 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-03 01:45:10,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:10,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:10,765 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-03 01:45:11,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:11,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:11,177 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-03 01:45:11,180 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-03 01:45:11,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:11,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:11,599 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-03 01:45:11,601 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-03 01:45:11,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:12,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:12,010 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-03 01:45:12,012 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-03 01:45:12,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:12,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:12,420 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-03 01:45:12,422 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-03 01:45:12,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:12,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:12,826 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-03 01:45:12,828 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-03 01:45:13,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:13,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:13,256 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-03 01:45:13,258 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-03 01:45:13,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:13,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:13,698 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-03 01:45:13,699 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-03 01:45:13,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:14,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:14,100 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-03 01:45:14,102 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-03 01:45:14,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:14,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:14,511 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-03 01:45:14,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:14,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:14,924 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-03 01:45:15,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:15,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:15,331 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-03 01:45:15,333 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-03 01:45:15,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:15,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:15,746 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-03 01:45:15,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:16,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:16,162 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-03 01:45:16,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:16,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:16,577 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-03 01:45:16,579 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-03 01:45:16,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:16,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:16,994 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-03 01:45:16,996 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-03 01:45:17,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:17,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:17,407 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-03 01:45:17,409 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-03 01:45:17,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:17,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:17,827 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-03 01:45:17,829 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-03 01:45:18,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-03 01:45:18,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-03 01:45:18,249 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-03 01:45:18,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-03 01:45:18,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a4d92b350> has local changes
2025-04-03 01:45:18,340 [ 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 171 will-moore 'Initial addition of integration tests' (stage: draft)
- 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])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#376 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/376/)'
2025-04-03 01:45:18,354 [ scc.git] DEBUG [detached HEAD 6f69ca1] merge master -Dorg -Ssuccess-only
2025-04-03 01:45:18,354 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-03 01:45:18,354 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-03 01:45:18,354 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-03 01:45:18,354 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-03 01:45:18,354 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-03 01:45:18,354 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-03 01:45:18,354 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-03 01:45:18,354 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,354 [ scc.merge] INFO
2025-04-03 01:45:18,354 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,354 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-03 01:45:18,355 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests' (stage: draft)
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-03 01:45:18,355 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-03 01:45:18,355 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-03 01:45:18,355 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-03 01:45:18,355 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,355 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-03 01:45:18,355 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,355 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-03 01:45:18,356 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-03 01:45:18,356 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-03 01:45:18,356 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-03 01:45:18,356 [ scc.merge] INFO
2025-04-03 01:45:18,356 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-03 01:45:18,356 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,356 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-03 01:45:18,356 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-03 01:45:18,357 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-03 01:45:18,357 [ scc.merge] INFO Previously merged:
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-03 01:45:18,357 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-03 01:45:18,357 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-03 01:45:18,357 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-03 01:45:18,357 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-03 01:45:18,357 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-03 01:45:18,357 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,357 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-03 01:45:18,357 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,357 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-03 01:45:18,358 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-03 01:45:18,358 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,358 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-03 01:45:18,358 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO
2025-04-03 01:45:18,358 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-03 01:45:18,359 [ scc.merge] INFO Already up to date.
2025-04-03 01:45:18,359 [ scc.merge] INFO
2025-04-03 01:45:18,359 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-03 01:45:18,359 [ scc.merge] INFO
2025-04-03 01:45:18,359 [ scc.merge] INFO Repository: ome/scripts
2025-04-03 01:45:18,359 [ scc.merge] INFO Excluded PRs:
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-03 01:45:18,359 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-03 01:45:18,359 [ scc.merge] INFO Previously merged:
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-03 01:45:18,359 [ scc.merge] INFO
2025-04-03 01:45:18,359 [ scc.merge] INFO Merged PRs:
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-03 01:45:18,359 [ scc.merge] INFO
2025-04-03 01:45:18,359 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-03 01:45:18,359 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-03 01:45:18,359 [ scc.merge] INFO
2025-04-03 01:45:18,359 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-03 01:45:18,359 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-03 01:45:18,361 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-03 01:45:18,363 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-03 01:45:18,366 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-03 01:45:18,368 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-03 01:45:18,370 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-03 01:45:18,372 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-03 01:45:18,375 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-03 01:45:18,377 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-03 01:45:18,379 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-03 01:45:18,381 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-03 01:45:18,383 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-03 01:45:18,385 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-03 01:45:18,388 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-03 01:45:18,390 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-03 01:45:18,392 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-03 01:45:18,394 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-03 01:45:18,396 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-03 01:45:18,398 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-03 01:45:18,401 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-03 01:45:18,403 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-03 01:45:18,405 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-03 01:45:18,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-03 01:45:18,407 [ scc.git] DEBUG Calling 'git remote'
2025-04-03 01:45:18,409 [ 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 b1544ab] 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 8a26683] 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-03 01:46:05,719 [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-03 01:46:15,192 [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-03 01:46:17,689 [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-03 01:46:22,470 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-03 01:47:01,932 [ 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/f8f0d1dd/images/svgs/logo.svg){kind=logo}
