Skipping 225 KB..
Full Log2025-04-08 11:43:25,985 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 11:43:25,985 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-08 11:43:26,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:26,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:26,392 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 11:43:26,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:26,401 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 11:43:26,437 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-08 11:43:26,437 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-08 11:43:26,437 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:43:26,438 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:43:26,441 [ scc.git] DEBUG Calling 'git reset --hard 64bd22d559ae54a4f51e1b7acabf859434a709e9'
2025-04-08 11:43:26,448 [ scc.git] DEBUG HEAD is now at 64bd22d merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-08 11:43:26,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:26,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:26,824 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 11:43:26,827 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-08 11:43:26,830 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-08 11:43:26,832 [ scc.config] DEBUG Found github.token
2025-04-08 11:43:26,832 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-08 11:43:26,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-08 11:43:26,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:26,841 [ 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-08 11:43:26,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:26,861 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 11:43:26,861 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 11:43:27,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:27,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:27,238 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:43:27,277 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:27,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:27,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:43:27,316 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:43:27,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38baf1ad0> has no local changes
2025-04-08 11:43:27,324 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:43:27,331 [ scc.git] DEBUG [detached HEAD e67ccb6] merge master -Dorg -Ssuccess-only
2025-04-08 11:43:27,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:43:27,331 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:43:27,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:27,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-08 11:43:28,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:28,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-08 11:43:28,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:28,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-08 11:43:29,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:29,312 [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-08 11:43:29,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:29,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-08 11:43:30,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:30,211 [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-08 11:43:30,211 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:43:30,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:30,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-08 11:43:30,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:31,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-08 11:43:31,588 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:31,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-08 11:43:32,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:32,298 [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-08 11:43:32,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:32,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-08 11:43:33,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:33,168 [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-08 11:43:33,169 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-08 11:43:33,169 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:43:33,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-08 11:43:33,169 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:33,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:33,172 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:43:33,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:43:33,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:43:33,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:43:33,180 [ scc.git] DEBUG Already up to date.
2025-04-08 11:43:33,180 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-08 11:43:33,458 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-08 11:43:33,458 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-08 11:43:33,462 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-08 11:43:33,748 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-08 11:43:33,748 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-08 11:43:33,753 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:43:33,753 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:33,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:33,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-08 11:43:33,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:33,761 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-08 11:43:33,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:33,774 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-08 11:43:33,774 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-08 11:43:33,774 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-08 11:43:33,774 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-08 11:43:33,774 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-08 11:43:33,774 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-08 11:43:33,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:33,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:33,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-08 11:43:33,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:33,943 [ 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-08 11:43:33,952 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:33,955 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 11:43:33,955 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 11:43:34,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:34,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:34,359 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:43:34,398 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:34,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:34,400 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:43:34,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:43:34,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38b9c2e10> has no local changes
2025-04-08 11:43:34,443 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:43:34,450 [ scc.git] DEBUG [detached HEAD 354e10a] merge master -Dorg -Ssuccess-only
2025-04-08 11:43:34,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:43:34,450 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:43:34,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:34,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-08 11:43:35,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:35,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-08 11:43:35,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:35,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-08 11:43:36,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:36,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-08 11:43:36,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:37,020 [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-08 11:43:37,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:37,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-08 11:43:37,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:37,907 [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-08 11:43:37,907 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-08 11:43:38,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:38,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-08 11:43:38,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:38,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-08 11:43:39,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:39,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-08 11:43:39,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:39,995 [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-08 11:43:40,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:40,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-08 11:43:40,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:40,933 [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-08 11:43:40,933 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-08 11:43:40,933 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:43:40,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-08 11:43:40,934 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:40,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:40,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:43:40,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:43:40,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:43:40,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:43:40,949 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-08 11:43:41,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:41,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-08 11:43:41,608 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-08 11:43:41,900 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-08 11:43:41,900 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-08 11:43:41,904 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-08 11:43:42,175 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-08 11:43:42,175 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-08 11:43:42,180 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:43:42,180 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:42,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:42,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-08 11:43:42,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:42,189 [ 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-08 11:43:42,202 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-08 11:43:42,202 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-08 11:43:42,202 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-08 11:43:42,202 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-08 11:43:42,202 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:43:42,202 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:43:42,205 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 11:43:42,210 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-08 11:43:42,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:42,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:42,367 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-08 11:43:42,372 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 11:43:42,375 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-08 11:43:42,377 [ scc.config] DEBUG Found github.token
2025-04-08 11:43:42,377 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-08 11:43:42,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-08 11:43:42,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:42,384 [ 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-08 11:43:42,399 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-08 11:43:42,399 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-08 11:43:42,399 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-08 11:43:42,399 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:43:42,400 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:43:42,402 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 11:43:42,407 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-08 11:43:42,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:42,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:42,796 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-08 11:43:42,800 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 11:43:42,803 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/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-08 11:43:42,805 [ scc.config] DEBUG Found github.token
2025-04-08 11:43:42,805 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-08 11:43:42,805 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:43:42,843 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:42,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:42,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:43:42,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:43:42,887 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38e1566d0> has no local changes
2025-04-08 11:43:42,887 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:43:42,895 [ scc.git] DEBUG [detached HEAD ca34624] merge master -Dorg -Ssuccess-only
2025-04-08 11:43:42,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:43:42,895 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:43:43,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:43,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-08 11:43:43,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:43,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-08 11:43:44,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:44,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-08 11:43:44,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:45,018 [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-08 11:43:45,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:45,511 [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-08 11:43:45,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:45,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-08 11:43:46,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:46,437 [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-08 11:43:46,437 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:43:46,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:46,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-08 11:43:46,927 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-08 11:43:47,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:47,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-08 11:43:47,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:48,031 [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-08 11:43:48,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:48,568 [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-08 11:43:48,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:49,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-08 11:43:49,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:49,509 [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-08 11:43:49,509 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-08 11:43:49,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:49,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-08 11:43:49,988 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-08 11:43:50,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:50,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-08 11:43:50,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:51,071 [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-08 11:43:51,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:51,586 [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-08 11:43:51,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:52,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-08 11:43:52,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:52,495 [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-08 11:43:52,495 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-08 11:43:52,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:52,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-08 11:43:53,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:53,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-08 11:43:53,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:54,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-08 11:43:54,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:54,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-08 11:43:54,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:55,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-08 11:43:55,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:55,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-08 11:43:55,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:56,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-08 11:43:56,128 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:43:56,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-08 11:43:56,128 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:56,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:56,131 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:43:56,133 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:43:56,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:43:56,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:43:56,140 [ scc.git] DEBUG Already up to date.
2025-04-08 11:43:56,140 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-08 11:43:56,444 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 11:43:56,444 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-08 11:43:56,448 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-08 11:43:56,721 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 11:43:56,721 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-08 11:43:56,726 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-08 11:43:56,983 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 11:43:56,983 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-08 11:43:56,987 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:43:56,987 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:56,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:56,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-08 11:43:56,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:56,994 [ 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-08 11:43:57,003 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:57,006 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-08 11:43:57,006 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 11:43:57,006 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-08 11:43:57,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:57,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:57,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-08 11:43:57,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:57,182 [ 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-08 11:43:57,191 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-08 11:43:57,191 [ scc.git] DEBUG Auto-merging package.json
2025-04-08 11:43:57,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:57,196 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-08 11:43:57,196 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 11:43:57,196 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-08 11:43:57,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:57,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:57,596 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-08 11:43:57,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:57,601 [ 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-08 11:43:57,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:43:57,612 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 11:43:57,612 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 11:43:57,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:58,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:43:58,012 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:43:58,052 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:58,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:58,055 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:43:58,092 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:43:58,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38b995110> has no local changes
2025-04-08 11:43:58,096 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:43:58,103 [ scc.git] DEBUG [detached HEAD 28dc92c] merge master -Dorg -Ssuccess-only
2025-04-08 11:43:58,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:43:58,103 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:43:58,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:58,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-08 11:43:58,487 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:43:58,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-08 11:43:58,487 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:58,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:58,490 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:43:58,492 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:43:58,492 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:43:58,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:43:58,498 [ scc.git] DEBUG Already up to date.
2025-04-08 11:43:58,498 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:43:58,498 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:58,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:58,500 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:43:58,538 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:43:58,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:43:58,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:43:58,579 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:43:58,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38ba2b450> has no local changes
2025-04-08 11:43:58,582 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:43:58,589 [ scc.git] DEBUG [detached HEAD 6dd9d99] merge master -Dorg -Ssuccess-only
2025-04-08 11:43:58,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:43:58,589 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:43:58,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:59,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-08 11:43:59,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:43:59,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-08 11:43:59,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:00,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-08 11:44:00,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:00,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-08 11:44:00,598 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:00,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-08 11:44:00,598 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:00,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:00,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:00,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:00,604 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:00,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:00,610 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:00,610 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:00,610 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:00,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:00,612 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:00,651 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:00,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:00,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:00,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:00,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38df0fb10> has no local changes
2025-04-08 11:44:00,694 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:00,701 [ scc.git] DEBUG [detached HEAD 2292871] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:00,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:00,701 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:00,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:01,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-08 11:44:01,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:01,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-08 11:44:01,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:02,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-08 11:44:02,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:02,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-08 11:44:02,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:03,207 [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-08 11:44:03,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:03,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-08 11:44:03,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:04,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-08 11:44:04,148 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-08 11:44:04,148 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:04,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-08 11:44:04,148 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:04,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:04,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:04,153 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:04,153 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:04,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:04,160 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:04,160 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-08 11:44:04,453 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-08 11:44:04,454 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-08 11:44:04,458 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:04,458 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:04,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:04,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 11:44:04,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:04,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 11:44:04,475 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG Auto-merging setup.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-08 11:44:04,475 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:44:04,475 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:44:04,478 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-08 11:44:04,483 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-08 11:44:04,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:04,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:04,657 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 11:44:04,661 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-08 11:44:04,664 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-04-08 11:44:04,666 [ scc.config] DEBUG Found github.token
2025-04-08 11:44:04,666 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-08 11:44:04,666 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:04,705 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:04,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:04,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:04,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:04,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38884da50> has no local changes
2025-04-08 11:44:04,749 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:04,755 [ scc.git] DEBUG [detached HEAD 30753d6] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:04,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:04,755 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:04,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:05,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-08 11:44:05,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:05,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-08 11:44:06,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:06,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-08 11:44:06,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:06,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-08 11:44:07,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:07,455 [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-08 11:44:07,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:07,974 [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-08 11:44:08,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:08,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-08 11:44:08,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:08,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-08 11:44:09,248 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:09,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-08 11:44:09,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:10,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-08 11:44:10,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:10,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-08 11:44:10,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:11,149 [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-08 11:44:11,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:11,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-08 11:44:11,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:12,055 [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-08 11:44:12,056 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-08 11:44:12,056 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:12,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-08 11:44:12,057 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:12,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:12,059 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:12,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:12,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:12,065 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:12,068 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:12,068 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-08 11:44:12,375 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-08 11:44:12,375 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-08 11:44:12,380 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:12,380 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:12,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:12,382 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-08 11:44:12,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:12,389 [ 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-08 11:44:12,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:44:12,404 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-08 11:44:12,404 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-08 11:44:12,404 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-08 11:44:12,404 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-08 11:44:12,405 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-08 11:44:12,405 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-08 11:44:12,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-08 11:44:12,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-08 11:44:12,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-08 11:44:12,406 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-08 11:44:12,406 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-08 11:44:12,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-08 11:44:12,407 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-08 11:44:12,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:12,573 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:12,613 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:12,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:12,615 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:12,653 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:12,657 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38bc12810> has no local changes
2025-04-08 11:44:12,658 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:12,665 [ scc.git] DEBUG [detached HEAD d8162d7] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:12,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:12,666 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:12,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:13,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-08 11:44:13,050 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:13,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-08 11:44:13,050 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:13,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:13,052 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:13,054 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:13,054 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:13,057 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:13,060 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:13,060 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:13,060 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:13,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:13,063 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:13,102 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:13,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:13,104 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:13,141 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:13,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38888c750> has no local changes
2025-04-08 11:44:13,145 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:13,151 [ scc.git] DEBUG [detached HEAD 9008549] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:13,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:13,152 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:13,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:13,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-08 11:44:13,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:14,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-08 11:44:14,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:14,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-08 11:44:14,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:15,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-08 11:44:15,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:15,629 [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-08 11:44:15,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:16,124 [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-08 11:44:16,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:16,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-08 11:44:16,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:17,070 [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-08 11:44:17,071 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-08 11:44:17,071 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:17,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-08 11:44:17,071 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:17,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:17,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:17,076 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:17,076 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:17,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:17,082 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:17,082 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-08 11:44:17,368 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-08 11:44:17,368 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-08 11:44:17,372 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:17,372 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:17,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:17,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-08 11:44:17,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:17,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-08 11:44:17,387 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:44:17,390 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-08 11:44:17,390 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-08 11:44:17,391 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-08 11:44:17,391 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-08 11:44:17,391 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-08 11:44:17,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:17,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:17,591 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:17,629 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:17,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:17,631 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:17,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:17,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa388840690> has no local changes
2025-04-08 11:44:17,673 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:17,679 [ scc.git] DEBUG [detached HEAD 572444a] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:17,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:17,680 [ scc.git] INFO Overriding base-branch from master to main
2025-04-08 11:44:17,680 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:17,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:18,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-08 11:44:18,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:18,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-08 11:44:18,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:19,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-08 11:44:19,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:19,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-08 11:44:19,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:20,198 [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-08 11:44:20,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:20,692 [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-08 11:44:20,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:21,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-08 11:44:21,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:21,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-08 11:44:21,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:22,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-08 11:44:22,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:22,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-08 11:44:23,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:23,272 [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-08 11:44:23,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:23,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-08 11:44:24,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:24,244 [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-08 11:44:24,245 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-08 11:44:24,245 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:24,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-08 11:44:24,245 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:24,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:24,248 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-08 11:44:24,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:24,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-08 11:44:24,254 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-08 11:44:24,257 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:24,257 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-08 11:44:24,530 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-08 11:44:24,530 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-08 11:44:24,534 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:24,534 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:24,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:24,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 11:44:24,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:24,542 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 11:44:24,549 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-08 11:44:24,550 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-08 11:44:24,550 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:44:24,550 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:44:24,553 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-08 11:44:24,558 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-08 11:44:24,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:24,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:24,754 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 11:44:24,757 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-08 11:44:24,760 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-08 11:44:24,762 [ scc.config] DEBUG Found github.token
2025-04-08 11:44:24,762 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-08 11:44:24,763 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:24,801 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:24,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:24,804 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:24,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:24,847 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa388872c10> has no local changes
2025-04-08 11:44:24,847 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:24,853 [ scc.git] DEBUG [detached HEAD ea8ebc7] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:24,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:24,854 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:25,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:25,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-08 11:44:25,215 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:25,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-08 11:44:25,215 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:25,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:25,220 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:25,223 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:25,226 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:25,226 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:25,226 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,228 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:25,267 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,270 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:25,307 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:25,310 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa388891210> has no local changes
2025-04-08 11:44:25,310 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:25,317 [ scc.git] DEBUG [detached HEAD 7946651] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:25,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:25,317 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:25,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:25,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-08 11:44:25,658 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:25,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-08 11:44:25,658 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,661 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:25,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:25,663 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:25,666 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:25,669 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:25,669 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:25,669 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,672 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:25,710 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:25,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:25,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:25,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:25,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa388884890> has no local changes
2025-04-08 11:44:25,754 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:25,760 [ scc.git] DEBUG [detached HEAD 5328183] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:25,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:25,761 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:25,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:26,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-08 11:44:26,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:26,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-08 11:44:26,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:27,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-08 11:44:27,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:27,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-08 11:44:27,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:28,167 [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-08 11:44:28,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:28,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-08 11:44:28,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:29,060 [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-08 11:44:29,061 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-08 11:44:29,061 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:29,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-08 11:44:29,061 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:29,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:29,064 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 11:44:29,066 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:29,066 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 11:44:29,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 11:44:29,072 [ scc.git] DEBUG Already up to date.
2025-04-08 11:44:29,072 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-08 11:44:29,344 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-08 11:44:29,344 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-08 11:44:29,348 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:29,348 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:29,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:29,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 11:44:29,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:29,356 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 11:44:29,364 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-08 11:44:29,364 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-08 11:44:29,365 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:44:29,365 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:44:29,368 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-08 11:44:29,373 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-08 11:44:29,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:29,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:29,542 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 11:44:29,545 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-08 11:44:29,548 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-08 11:44:29,550 [ scc.config] DEBUG Found github.token
2025-04-08 11:44:29,550 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-08 11:44:29,550 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:29,589 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:29,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:29,591 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:29,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:29,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa388810b90> has no local changes
2025-04-08 11:44:29,634 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:29,641 [ scc.git] DEBUG [detached HEAD 96f1d89] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:29,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:29,641 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-08 11:44:29,641 [ scc.repo] DEBUG ## PRs found:
2025-04-08 11:44:29,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:30,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-08 11:44:30,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:30,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-08 11:44:30,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:31,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-08 11:44:31,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:31,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-08 11:44:31,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:32,070 [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-08 11:44:32,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:32,578 [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-08 11:44:32,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:33,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-08 11:44:33,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:33,556 [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-08 11:44:33,557 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-08 11:44:33,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:34,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-08 11:44:34,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:34,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-08 11:44:34,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:35,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-08 11:44:35,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:35,532 [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-08 11:44:35,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:35,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-08 11:44:36,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:36,430 [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-08 11:44:36,431 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-08 11:44:36,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:36,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-08 11:44:37,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:37,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-08 11:44:37,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:37,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-08 11:44:38,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:38,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-08 11:44:38,457 [ scc.repo] DEBUG ## Branches found:
2025-04-08 11:44:38,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-08 11:44:38,457 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:38,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:38,460 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-08 11:44:38,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 11:44:38,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-08 11:44:38,466 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-08 11:44:38,474 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-08 11:44:38,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:39,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-08 11:44:39,161 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-08 11:44:39,482 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-08 11:44:39,482 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-08 11:44:39,487 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-08 11:44:39,772 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-08 11:44:39,772 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-08 11:44:39,776 [ scc.git] DEBUG ## Unique users: []
2025-04-08 11:44:39,776 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:39,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:39,779 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-08 11:44:39,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:39,787 [ 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-08 11:44:39,797 [ 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-08 11:44:39,798 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 11:44:39,798 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 11:44:39,800 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-08 11:44:39,804 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-08 11:44:39,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:39,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:39,959 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-08 11:44:39,964 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-08 11:44:39,968 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#382](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-08 11:44:39,970 [ scc.config] DEBUG Found github.token
2025-04-08 11:44:39,970 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-08 11:44:39,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-08 11:44:39,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:39,977 [ 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-08 11:44:39,987 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 11:44:39,991 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-08 11:44:39,991 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-08 11:44:40,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:40,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:40,369 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 11:44:40,409 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 11:44:40,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 11:44:40,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:40,450 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:40,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38baf1850> has no local changes
2025-04-08 11:44:40,454 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:40,460 [ scc.git] DEBUG [detached HEAD c8230bb] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:40,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:40,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 11:44:40,536 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-08 11:44:40,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:40,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:40,801 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-08 11:44:40,803 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-08 11:44:41,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:41,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:41,216 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-08 11:44:41,219 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-08 11:44:41,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:41,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:41,627 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-08 11:44:41,629 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-08 11:44:41,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:42,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:42,046 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-08 11:44:42,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:42,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:42,445 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-08 11:44:42,447 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-08 11:44:42,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:42,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:42,888 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-08 11:44:42,891 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-08 11:44:43,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:43,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:43,299 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-08 11:44:43,301 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-08 11:44:43,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:43,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:43,731 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-08 11:44:43,733 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-08 11:44:43,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:44,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:44,149 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-08 11:44:44,151 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-08 11:44:44,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:44,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:44,567 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-08 11:44:44,569 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-08 11:44:44,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:44,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:44,979 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-08 11:44:44,981 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-08 11:44:45,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:45,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:45,399 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-08 11:44:45,401 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-08 11:44:45,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:45,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:45,820 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-08 11:44:46,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:46,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:46,250 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-08 11:44:46,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:46,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:46,694 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-08 11:44:46,696 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-08 11:44:46,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:47,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:47,110 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-08 11:44:47,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:47,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:47,522 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-08 11:44:47,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:47,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:47,942 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-08 11:44:47,944 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-08 11:44:48,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:48,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:48,365 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-08 11:44:48,367 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-08 11:44:48,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:48,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:48,799 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-08 11:44:48,801 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-08 11:44:49,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:49,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:49,220 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-08 11:44:49,222 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-08 11:44:49,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 11:44:49,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 11:44:49,639 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-08 11:44:49,639 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 11:44:49,726 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa38b92ac90> has local changes
2025-04-08 11:44:49,727 [ 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#382 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/382/)'
2025-04-08 11:44:49,740 [ scc.git] DEBUG [detached HEAD a9923c2] merge master -Dorg -Ssuccess-only
2025-04-08 11:44:49,740 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-08 11:44:49,741 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-08 11:44:49,741 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-08 11:44:49,741 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-08 11:44:49,741 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-08 11:44:49,741 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-08 11:44:49,741 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-08 11:44:49,741 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-08 11:44:49,741 [ scc.merge] INFO
2025-04-08 11:44:49,741 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-08 11:44:49,741 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-08 11:44:49,741 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-08 11:44:49,742 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-08 11:44:49,742 [ scc.merge] INFO Previously merged:
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-08 11:44:49,742 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-08 11:44:49,742 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-08 11:44:49,742 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,742 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-08 11:44:49,742 [ scc.merge] INFO
2025-04-08 11:44:49,742 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-08 11:44:49,742 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-08 11:44:49,743 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-08 11:44:49,743 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-08 11:44:49,743 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-08 11:44:49,743 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-08 11:44:49,743 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,743 [ scc.merge] INFO
2025-04-08 11:44:49,743 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-08 11:44:49,744 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-08 11:44:49,744 [ scc.merge] INFO Previously merged:
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-08 11:44:49,744 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-08 11:44:49,744 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-08 11:44:49,744 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-08 11:44:49,744 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-08 11:44:49,744 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-08 11:44:49,744 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-08 11:44:49,744 [ scc.merge] INFO
2025-04-08 11:44:49,744 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-08 11:44:49,744 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,744 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-08 11:44:49,745 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-08 11:44:49,745 [ scc.merge] INFO Already up to date.
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,745 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-08 11:44:49,745 [ scc.merge] INFO
2025-04-08 11:44:49,745 [ scc.merge] INFO Repository: ome/scripts
2025-04-08 11:44:49,746 [ scc.merge] INFO Excluded PRs:
2025-04-08 11:44:49,746 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-08 11:44:49,746 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-08 11:44:49,746 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-08 11:44:49,746 [ scc.merge] INFO Previously merged:
2025-04-08 11:44:49,746 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-08 11:44:49,746 [ scc.merge] INFO
2025-04-08 11:44:49,746 [ scc.merge] INFO Merged PRs:
2025-04-08 11:44:49,746 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-08 11:44:49,746 [ scc.merge] INFO
2025-04-08 11:44:49,746 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 11:44:49,746 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-08 11:44:49,746 [ scc.merge] INFO
2025-04-08 11:44:49,746 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-08 11:44:49,746 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-08 11:44:49,748 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-08 11:44:49,750 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-08 11:44:49,752 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-08 11:44:49,755 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-08 11:44:49,757 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-08 11:44:49,759 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-08 11:44:49,761 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-08 11:44:49,764 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-08 11:44:49,766 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-08 11:44:49,768 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-08 11:44:49,770 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-08 11:44:49,772 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-08 11:44:49,774 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-08 11:44:49,777 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-08 11:44:49,779 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-08 11:44:49,781 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-08 11:44:49,783 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-08 11:44:49,785 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-08 11:44:49,787 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-08 11:44:49,789 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-08 11:44:49,792 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 11:44:49,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-08 11:44:49,794 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 11:44:49,796 [ 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 f3089f3] 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 27f47d4] 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-08 11:45:37,953 [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-08 11:45:47,569 [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-08 11:45:50,105 [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-08 11:45:54,983 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-08 11:46:39,169 [ 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}
