Skipping 225 KB..
Full Log2025-04-09 01:20:00,100 [ scc.git] DEBUG package.json | 2 +-
2025-04-09 01:20:00,100 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-09 01:20:00,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:00,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:00,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-09 01:20:00,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:00,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-09 01:20:00,812 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-09 01:20:00,812 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-09 01:20:00,813 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:20:00,813 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:20:00,816 [ scc.git] DEBUG Calling 'git reset --hard 073cae5be2b7e1d38938f998f8eaf022217e76e1'
2025-04-09 01:20:00,824 [ scc.git] DEBUG HEAD is now at 073cae5 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-09 01:20:00,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:00,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:00,992 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-09 01:20:00,995 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-09 01:20:00,998 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-09 01:20:01,001 [ scc.config] DEBUG Found github.token
2025-04-09 01:20:01,001 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-09 01:20:01,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-09 01:20:01,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:01,010 [ 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-09 01:20:01,025 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:01,028 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-09 01:20:01,028 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-09 01:20:01,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:01,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:01,427 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:01,466 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:01,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:01,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:01,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:01,510 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee443ad90> has no local changes
2025-04-09 01:20:01,510 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:01,517 [ scc.git] DEBUG [detached HEAD 5d62727] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:01,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:01,517 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:01,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:01,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-09 01:20:02,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:02,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-09 01:20:02,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:03,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-09 01:20:03,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:03,544 [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-09 01:20:03,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:04,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-09 01:20:04,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:04,495 [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-09 01:20:04,496 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:20:04,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:04,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-09 01:20:05,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:05,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-09 01:20:05,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:06,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-09 01:20:06,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:06,576 [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-09 01:20:06,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:07,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-09 01:20:07,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:07,541 [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-09 01:20:07,542 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-09 01:20:07,542 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:07,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-09 01:20:07,542 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:07,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:07,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:07,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:07,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:07,551 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:07,554 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:07,554 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-09 01:20:08,423 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-09 01:20:08,423 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-09 01:20:08,428 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-09 01:20:08,772 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-09 01:20:08,772 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-09 01:20:08,776 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:08,776 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:08,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:08,778 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-09 01:20:08,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:08,784 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-09 01:20:08,847 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:08,851 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-09 01:20:08,851 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-09 01:20:08,851 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-09 01:20:08,851 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-09 01:20:08,851 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-09 01:20:08,851 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-09 01:20:08,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:09,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:09,011 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-09 01:20:09,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:09,017 [ 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-09 01:20:09,027 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:09,029 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-09 01:20:09,030 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-09 01:20:09,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:09,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:09,435 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:09,474 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:09,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:09,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:09,515 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:09,518 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee4601350> has no local changes
2025-04-09 01:20:09,519 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:09,525 [ scc.git] DEBUG [detached HEAD aab6fe7] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:09,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:09,526 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:09,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:09,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-09 01:20:10,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:10,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-09 01:20:10,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:11,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-09 01:20:11,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:11,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-09 01:20:11,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:12,065 [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-09 01:20:12,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:12,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-09 01:20:12,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:12,998 [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-09 01:20:12,998 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-09 01:20:13,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:13,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-09 01:20:13,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:13,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-09 01:20:14,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:14,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-09 01:20:14,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:15,085 [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-09 01:20:15,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:15,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-09 01:20:15,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:16,058 [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-09 01:20:16,058 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-09 01:20:16,058 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:16,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-09 01:20:16,058 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:16,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:16,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:16,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:16,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:16,067 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:16,074 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-09 01:20:16,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:16,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-09 01:20:16,775 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-09 01:20:17,668 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-09 01:20:17,668 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-09 01:20:17,673 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-09 01:20:18,201 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-09 01:20:18,202 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-09 01:20:18,206 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:18,206 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:18,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:18,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-09 01:20:18,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:18,215 [ 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-09 01:20:18,341 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-09 01:20:18,341 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-09 01:20:18,341 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-09 01:20:18,341 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-09 01:20:18,341 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:20:18,342 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:20:18,344 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-09 01:20:18,349 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-09 01:20:18,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:18,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:18,512 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-09 01:20:18,517 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-09 01:20:18,520 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-09 01:20:18,522 [ scc.config] DEBUG Found github.token
2025-04-09 01:20:18,522 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-09 01:20:18,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-09 01:20:18,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:18,529 [ 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-09 01:20:18,654 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-09 01:20:18,654 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-09 01:20:18,654 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-09 01:20:18,654 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:20:18,654 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:20:18,657 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-09 01:20:18,663 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-09 01:20:18,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:18,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:18,933 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-09 01:20:18,937 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-09 01:20:18,940 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/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-09 01:20:18,942 [ scc.config] DEBUG Found github.token
2025-04-09 01:20:18,942 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-09 01:20:18,942 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:18,981 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:18,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:18,983 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:19,020 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:19,024 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee232aed0> has no local changes
2025-04-09 01:20:19,024 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:19,031 [ scc.git] DEBUG [detached HEAD ea2c271] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:19,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:19,031 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:19,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:19,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-09 01:20:19,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:20,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-09 01:20:20,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:20,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-09 01:20:20,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:21,241 [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-09 01:20:21,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:21,747 [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-09 01:20:21,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:22,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-09 01:20:22,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:22,709 [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-09 01:20:22,710 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:20:22,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:23,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-09 01:20:23,192 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-09 01:20:23,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:23,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-09 01:20:24,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:24,364 [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-09 01:20:24,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:24,938 [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-09 01:20:25,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:25,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-09 01:20:25,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:25,966 [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-09 01:20:25,967 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-09 01:20:26,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:26,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-09 01:20:26,445 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-09 01:20:26,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:27,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-09 01:20:27,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:27,548 [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-09 01:20:27,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:28,215 [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-09 01:20:28,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:28,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-09 01:20:29,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:29,212 [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-09 01:20:29,212 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-09 01:20:29,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:29,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-09 01:20:29,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:30,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-09 01:20:30,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:30,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-09 01:20:30,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:31,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-09 01:20:31,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:31,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-09 01:20:31,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:32,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-09 01:20:32,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:32,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-09 01:20:32,694 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:32,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-09 01:20:32,695 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:32,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:32,697 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:32,700 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:32,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:32,703 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:32,706 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:32,706 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-09 01:20:32,996 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-09 01:20:32,996 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-09 01:20:33,001 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-09 01:20:33,258 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-09 01:20:33,258 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-09 01:20:33,262 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-09 01:20:33,636 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-09 01:20:33,636 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-09 01:20:33,640 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:33,641 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:33,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:33,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-09 01:20:33,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:33,717 [ 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-09 01:20:33,802 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:33,806 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-09 01:20:33,806 [ scc.git] DEBUG package.json | 2 +-
2025-04-09 01:20:33,806 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-09 01:20:33,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:33,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:33,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-09 01:20:34,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:34,077 [ 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-09 01:20:34,366 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-09 01:20:34,366 [ scc.git] DEBUG Auto-merging package.json
2025-04-09 01:20:34,367 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:34,371 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-09 01:20:34,371 [ scc.git] DEBUG package.json | 2 +-
2025-04-09 01:20:34,371 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-09 01:20:34,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:34,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:34,539 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-09 01:20:34,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:34,544 [ 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-09 01:20:34,553 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:34,556 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-09 01:20:34,556 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-09 01:20:34,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:34,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:34,950 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:34,989 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:34,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:34,992 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:35,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:35,033 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee444da10> has no local changes
2025-04-09 01:20:35,033 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:35,039 [ scc.git] DEBUG [detached HEAD 7e16a57] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:35,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:35,040 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:35,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:35,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-09 01:20:35,401 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:35,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-09 01:20:35,401 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:35,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:35,403 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:35,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:35,405 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:35,408 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:35,411 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:35,411 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:35,411 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:35,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:35,414 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:35,452 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:35,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:35,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:35,491 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:35,495 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee2318ad0> has no local changes
2025-04-09 01:20:35,495 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:35,501 [ scc.git] DEBUG [detached HEAD 3f2d31c] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:35,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:35,501 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:35,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:35,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-09 01:20:36,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:36,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-09 01:20:36,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:36,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-09 01:20:37,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:37,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-09 01:20:37,465 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:37,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-09 01:20:37,465 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:37,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:37,468 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:37,470 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:37,470 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:37,473 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:37,476 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:37,476 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:37,476 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:37,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:37,478 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:37,517 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:37,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:37,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:37,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:37,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee4524bd0> has no local changes
2025-04-09 01:20:37,559 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:37,566 [ scc.git] DEBUG [detached HEAD 09ef4ef] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:37,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:37,566 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:37,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:38,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-09 01:20:38,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:38,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-09 01:20:38,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:39,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-09 01:20:39,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:39,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-09 01:20:39,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:40,165 [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-09 01:20:40,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:40,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-09 01:20:40,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:41,058 [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-09 01:20:41,059 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-09 01:20:41,059 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:41,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-09 01:20:41,059 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:41,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:41,062 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:41,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:41,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:41,067 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:41,070 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:41,070 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-09 01:20:41,486 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-09 01:20:41,486 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-09 01:20:41,490 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:41,490 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:41,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:41,493 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-09 01:20:41,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:41,498 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-09 01:20:41,630 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG Auto-merging setup.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-09 01:20:41,630 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:20:41,630 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:20:41,633 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-09 01:20:41,637 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-09 01:20:41,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:41,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:41,796 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-09 01:20:41,800 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-09 01:20:41,803 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2025-04-09 01:20:41,805 [ scc.config] DEBUG Found github.token
2025-04-09 01:20:41,805 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-09 01:20:41,805 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:41,844 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:41,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:41,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:41,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:41,887 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee47041d0> has no local changes
2025-04-09 01:20:41,887 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:41,893 [ scc.git] DEBUG [detached HEAD 41b4844] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:41,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:41,894 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:42,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:42,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-09 01:20:42,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:42,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-09 01:20:43,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:43,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-09 01:20:43,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:43,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-09 01:20:44,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:44,499 [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-09 01:20:44,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:44,982 [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-09 01:20:45,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:45,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-09 01:20:45,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:45,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-09 01:20:46,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:46,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-09 01:20:46,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:46,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-09 01:20:47,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:47,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-09 01:20:47,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:48,073 [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-09 01:20:48,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-09 01:20:48,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:49,030 [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-09 01:20:49,030 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-09 01:20:49,031 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:49,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-09 01:20:49,031 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:49,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:49,034 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:49,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:49,036 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:49,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:49,042 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:49,042 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-09 01:20:49,419 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-09 01:20:49,419 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-09 01:20:49,423 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:49,423 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:49,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:49,425 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-09 01:20:49,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:49,432 [ 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-09 01:20:49,444 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-09 01:20:49,448 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-09 01:20:49,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:49,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-09 01:20:49,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-09 01:20:49,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-09 01:20:49,449 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-09 01:20:49,450 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-09 01:20:49,450 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-09 01:20:49,450 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-09 01:20:49,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:49,658 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:49,698 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:49,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:49,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:49,738 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:49,742 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee2379090> has no local changes
2025-04-09 01:20:49,742 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:49,749 [ scc.git] DEBUG [detached HEAD d852bfc] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:49,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:49,750 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:49,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:50,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-09 01:20:50,123 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:50,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-09 01:20:50,123 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:50,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:50,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:50,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:50,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:50,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:50,134 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:50,134 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:50,134 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:50,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:50,136 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:50,174 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:50,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:50,176 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:50,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:50,216 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee2359a90> has no local changes
2025-04-09 01:20:50,216 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:50,222 [ scc.git] DEBUG [detached HEAD a37165d] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:50,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:50,222 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:50,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:50,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-09 01:20:50,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:51,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-09 01:20:51,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:51,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-09 01:20:51,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:52,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-09 01:20:52,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:52,669 [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-09 01:20:52,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:53,198 [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-09 01:20:53,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:53,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-09 01:20:54,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:54,200 [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-09 01:20:54,200 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-09 01:20:54,200 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:20:54,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-09 01:20:54,200 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:54,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:54,203 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:20:54,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:20:54,206 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:20:54,208 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:20:54,211 [ scc.git] DEBUG Already up to date.
2025-04-09 01:20:54,211 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-09 01:20:55,027 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-09 01:20:55,027 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-09 01:20:55,032 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:20:55,032 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:55,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:55,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-09 01:20:55,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:55,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-09 01:20:55,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:20:55,050 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-09 01:20:55,050 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-09 01:20:55,050 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-09 01:20:55,050 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-09 01:20:55,050 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-09 01:20:55,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:55,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:20:55,214 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:20:55,253 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:20:55,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:20:55,255 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:20:55,293 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:20:55,296 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee2338b50> has no local changes
2025-04-09 01:20:55,296 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:20:55,303 [ scc.git] DEBUG [detached HEAD 12e5a4a] merge master -Dorg -Ssuccess-only
2025-04-09 01:20:55,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:20:55,303 [ scc.git] INFO Overriding base-branch from master to main
2025-04-09 01:20:55,303 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:20:55,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:55,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-09 01:20:55,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:56,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-09 01:20:56,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:56,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-09 01:20:57,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:57,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-09 01:20:57,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:57,899 [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-09 01:20:58,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:58,386 [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-09 01:20:58,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:58,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-09 01:20:59,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:59,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-09 01:20:59,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:20:59,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-09 01:21:00,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:00,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-09 01:21:00,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:00,905 [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-09 01:21:01,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:01,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-09 01:21:01,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:01,857 [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-09 01:21:01,858 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-09 01:21:01,858 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:21:01,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-09 01:21:01,858 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:01,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:01,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-09 01:21:01,863 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:21:01,864 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-09 01:21:01,866 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-09 01:21:01,869 [ scc.git] DEBUG Already up to date.
2025-04-09 01:21:01,869 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-09 01:21:02,236 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-09 01:21:02,236 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-09 01:21:02,239 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:21:02,240 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:02,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:02,242 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-09 01:21:02,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:02,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-09 01:21:02,354 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-09 01:21:02,354 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-09 01:21:02,354 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:21:02,354 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:21:02,357 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-09 01:21:02,361 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-09 01:21:02,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:02,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:02,527 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-09 01:21:02,531 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-09 01:21:02,533 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-09 01:21:02,535 [ scc.config] DEBUG Found github.token
2025-04-09 01:21:02,535 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-09 01:21:02,536 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:21:02,574 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:02,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:02,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:02,614 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:02,617 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee44a4a90> has no local changes
2025-04-09 01:21:02,617 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:02,624 [ scc.git] DEBUG [detached HEAD a52cfa2] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:02,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:02,625 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:21:02,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:02,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-09 01:21:02,989 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:21:02,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-09 01:21:02,990 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:02,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:02,993 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:21:02,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:21:02,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:21:02,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:21:03,000 [ scc.git] DEBUG Already up to date.
2025-04-09 01:21:03,001 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:21:03,001 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:03,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:03,003 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:21:03,041 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:03,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:03,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:03,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:03,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee2315cd0> has no local changes
2025-04-09 01:21:03,083 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:03,090 [ scc.git] DEBUG [detached HEAD dfa4568] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:03,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:03,090 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:21:03,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:03,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-09 01:21:03,449 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:21:03,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-09 01:21:03,449 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:03,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:03,451 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:21:03,454 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:21:03,454 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:21:03,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:21:03,460 [ scc.git] DEBUG Already up to date.
2025-04-09 01:21:03,460 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:21:03,460 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:03,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:03,462 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:21:03,499 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:03,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:03,501 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:03,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:03,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee23a4ed0> has no local changes
2025-04-09 01:21:03,542 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:03,548 [ scc.git] DEBUG [detached HEAD b9fa17d] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:03,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:03,549 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:21:03,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:04,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-09 01:21:04,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:04,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-09 01:21:04,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:05,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-09 01:21:05,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:05,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-09 01:21:05,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:06,033 [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-09 01:21:06,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:06,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-09 01:21:06,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:07,004 [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-09 01:21:07,005 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-09 01:21:07,005 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:21:07,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-09 01:21:07,005 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:07,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:07,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-09 01:21:07,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:21:07,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-09 01:21:07,013 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-09 01:21:07,016 [ scc.git] DEBUG Already up to date.
2025-04-09 01:21:07,016 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-09 01:21:07,539 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-09 01:21:07,539 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-09 01:21:07,544 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:21:07,544 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:07,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:07,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-09 01:21:07,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:07,552 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-09 01:21:07,722 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-09 01:21:07,722 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-09 01:21:07,723 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:21:07,723 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:21:07,726 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-09 01:21:07,731 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-09 01:21:07,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:07,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:07,906 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-09 01:21:07,909 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-09 01:21:07,912 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-09 01:21:07,914 [ scc.config] DEBUG Found github.token
2025-04-09 01:21:07,914 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-09 01:21:07,914 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:21:07,953 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:07,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:07,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:07,993 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:07,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee23b5cd0> has no local changes
2025-04-09 01:21:07,997 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:08,003 [ scc.git] DEBUG [detached HEAD f0d6360] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:08,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:08,004 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-09 01:21:08,004 [ scc.repo] DEBUG ## PRs found:
2025-04-09 01:21:08,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:08,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-09 01:21:08,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:08,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-09 01:21:09,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:09,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-09 01:21:09,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:09,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-09 01:21:10,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:10,476 [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-09 01:21:10,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:10,953 [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-09 01:21:11,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:11,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-09 01:21:11,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:11,949 [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-09 01:21:11,950 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-09 01:21:12,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:12,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-09 01:21:12,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:12,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-09 01:21:13,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:13,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-09 01:21:13,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:13,862 [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-09 01:21:14,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:14,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-09 01:21:14,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:14,900 [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-09 01:21:14,900 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-09 01:21:15,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:15,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-09 01:21:15,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:15,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-09 01:21:16,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:16,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-09 01:21:16,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:17,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-09 01:21:17,035 [ scc.repo] DEBUG ## Branches found:
2025-04-09 01:21:17,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-09 01:21:17,035 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:17,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:17,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-09 01:21:17,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-09 01:21:17,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-09 01:21:17,044 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-09 01:21:17,052 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-09 01:21:17,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:17,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-09 01:21:17,750 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-09 01:21:18,659 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-09 01:21:18,659 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-09 01:21:18,663 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-09 01:21:19,268 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-09 01:21:19,268 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-09 01:21:19,273 [ scc.git] DEBUG ## Unique users: []
2025-04-09 01:21:19,273 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:19,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:19,275 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-09 01:21:19,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:19,283 [ 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-09 01:21:19,440 [ 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-09 01:21:19,440 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-09 01:21:19,441 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-09 01:21:19,444 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-09 01:21:19,447 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-09 01:21:19,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:19,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:19,636 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-09 01:21:19,641 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-09 01:21:19,645 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#383](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-09 01:21:19,647 [ scc.config] DEBUG Found github.token
2025-04-09 01:21:19,647 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-09 01:21:19,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-09 01:21:19,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:19,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-09 01:21:19,664 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-09 01:21:19,667 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-09 01:21:19,667 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-09 01:21:19,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:20,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:20,072 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-09 01:21:20,111 [ scc.git] DEBUG Get sha1 of %s
2025-04-09 01:21:20,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-09 01:21:20,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:20,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:20,154 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee23b4650> has no local changes
2025-04-09 01:21:20,154 [ 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#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:20,160 [ scc.git] DEBUG [detached HEAD f17e6f1] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:20,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:20,161 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-09 01:21:20,237 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-09 01:21:20,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:20,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:20,513 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-09 01:21:20,515 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-09 01:21:20,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:20,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:20,967 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-09 01:21:20,969 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-09 01:21:21,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:21,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:21,391 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-09 01:21:21,393 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-09 01:21:21,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:21,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:21,810 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-09 01:21:22,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:22,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:22,230 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-09 01:21:22,232 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-09 01:21:22,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:22,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:22,642 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-09 01:21:22,644 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-09 01:21:22,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:23,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:23,052 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-09 01:21:23,054 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-09 01:21:23,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:23,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:23,460 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-09 01:21:23,462 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-09 01:21:23,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:23,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:23,876 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-09 01:21:23,878 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-09 01:21:24,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:24,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:24,310 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-09 01:21:24,312 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-09 01:21:24,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:24,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:24,727 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-09 01:21:24,729 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-09 01:21:24,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:25,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:25,154 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-09 01:21:25,156 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-09 01:21:25,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:25,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:25,572 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-09 01:21:25,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:25,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:25,991 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-09 01:21:26,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:26,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:26,406 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-09 01:21:26,407 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-09 01:21:26,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:26,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:26,830 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-09 01:21:27,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:27,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:27,249 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-09 01:21:27,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:27,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:27,664 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-09 01:21:27,666 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-09 01:21:27,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:28,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:28,079 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-09 01:21:28,081 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-09 01:21:28,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:28,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:28,502 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-09 01:21:28,504 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-09 01:21:28,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:28,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:28,928 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-09 01:21:28,930 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-09 01:21:29,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-09 01:21:29,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-09 01:21:29,363 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-09 01:21:29,363 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-09 01:21:29,451 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbee4705010> has local changes
2025-04-09 01:21:29,451 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#383 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/383/)'
2025-04-09 01:21:29,465 [ scc.git] DEBUG [detached HEAD 92e04d2] merge master -Dorg -Ssuccess-only
2025-04-09 01:21:29,465 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-09 01:21:29,465 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-09 01:21:29,466 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-09 01:21:29,466 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-09 01:21:29,466 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-09 01:21:29,466 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-09 01:21:29,466 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-09 01:21:29,466 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-09 01:21:29,466 [ scc.merge] INFO
2025-04-09 01:21:29,466 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-09 01:21:29,466 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-09 01:21:29,466 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-09 01:21:29,467 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-09 01:21:29,467 [ scc.merge] INFO Previously merged:
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-09 01:21:29,467 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-09 01:21:29,467 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-09 01:21:29,467 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,467 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-09 01:21:29,467 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,467 [ scc.merge] INFO
2025-04-09 01:21:29,467 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-09 01:21:29,468 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-09 01:21:29,468 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-09 01:21:29,468 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-09 01:21:29,468 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,468 [ scc.merge] INFO
2025-04-09 01:21:29,468 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-09 01:21:29,468 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-09 01:21:29,468 [ scc.merge] INFO Previously merged:
2025-04-09 01:21:29,468 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-09 01:21:29,469 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-09 01:21:29,469 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-09 01:21:29,469 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-09 01:21:29,469 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-09 01:21:29,469 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-09 01:21:29,469 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-09 01:21:29,469 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-09 01:21:29,469 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-09 01:21:29,469 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,469 [ scc.merge] INFO
2025-04-09 01:21:29,469 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-09 01:21:29,470 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-09 01:21:29,470 [ scc.merge] INFO Already up to date.
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-09 01:21:29,470 [ scc.merge] INFO
2025-04-09 01:21:29,470 [ scc.merge] INFO Repository: ome/scripts
2025-04-09 01:21:29,470 [ scc.merge] INFO Excluded PRs:
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-09 01:21:29,470 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-09 01:21:29,470 [ scc.merge] INFO Previously merged:
2025-04-09 01:21:29,470 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-09 01:21:29,471 [ scc.merge] INFO
2025-04-09 01:21:29,471 [ scc.merge] INFO Merged PRs:
2025-04-09 01:21:29,471 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-09 01:21:29,471 [ scc.merge] INFO
2025-04-09 01:21:29,471 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-09 01:21:29,471 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-09 01:21:29,471 [ scc.merge] INFO
2025-04-09 01:21:29,471 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-09 01:21:29,471 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-09 01:21:29,473 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-09 01:21:29,475 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-09 01:21:29,477 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-09 01:21:29,480 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-09 01:21:29,482 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-09 01:21:29,484 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-09 01:21:29,486 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-09 01:21:29,488 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-09 01:21:29,490 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-09 01:21:29,492 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-09 01:21:29,495 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-09 01:21:29,497 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-09 01:21:29,499 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-09 01:21:29,501 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-09 01:21:29,503 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-09 01:21:29,505 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-09 01:21:29,507 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-09 01:21:29,509 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-09 01:21:29,512 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-09 01:21:29,514 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-09 01:21:29,516 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-09 01:21:29,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-09 01:21:29,518 [ scc.git] DEBUG Calling 'git remote'
2025-04-09 01:21:29,520 [ 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 cfae6f3] 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 a9de4a3] 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-09 01:22:18,775 [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-09 01:22:28,309 [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-09 01:22:30,875 [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-09 01:22:35,747 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-09 01:23:18,320 [ 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/861d2fbf/images/svgs/logo.svg){kind=logo}
