Skipping 226 KB..
Full Log2025-04-05 00:49:02,210 [ scc.git] DEBUG package.json | 2 +-
2025-04-05 00:49:02,210 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-05 00:49:02,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:02,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:02,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-05 00:49:02,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:02,589 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-05 00:49:02,627 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-05 00:49:02,627 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-05 00:49:02,627 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:49:02,627 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:49:02,630 [ scc.git] DEBUG Calling 'git reset --hard 91295887b2671ffcfb465430df6956a1f2e7f31a'
2025-04-05 00:49:02,638 [ scc.git] DEBUG HEAD is now at 9129588 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-05 00:49:02,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:02,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:02,991 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-05 00:49:02,994 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-05 00:49:02,997 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-05 00:49:02,999 [ scc.config] DEBUG Found github.token
2025-04-05 00:49:02,999 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-05 00:49:02,999 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-05 00:49:03,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:03,008 [ 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-05 00:49:03,022 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:03,025 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-05 00:49:03,025 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-05 00:49:03,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:03,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:03,404 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:03,442 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:03,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:03,444 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:03,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:03,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f129190b050> has no local changes
2025-04-05 00:49:03,485 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:03,492 [ scc.git] DEBUG [detached HEAD 46643c7] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:03,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:03,493 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:03,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:03,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-05 00:49:04,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:04,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-05 00:49:04,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:04,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-05 00:49:05,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:05,398 [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-05 00:49:05,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:05,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-05 00:49:06,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:06,349 [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-05 00:49:06,350 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:49:06,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:06,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-05 00:49:07,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:07,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-05 00:49:07,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:07,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-05 00:49:08,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:08,381 [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-05 00:49:08,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:08,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-05 00:49:09,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:09,340 [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-05 00:49:09,340 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-05 00:49:09,340 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:09,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-05 00:49:09,340 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:09,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:09,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:09,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:09,345 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:09,348 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:09,352 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:09,352 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-05 00:49:09,640 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-05 00:49:09,640 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-05 00:49:09,644 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-05 00:49:09,897 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-05 00:49:09,898 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-05 00:49:09,902 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:09,902 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:09,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:09,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-05 00:49:09,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:09,911 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-05 00:49:09,920 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:09,923 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-05 00:49:09,923 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-05 00:49:09,923 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-05 00:49:09,923 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-05 00:49:09,923 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-05 00:49:09,923 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-05 00:49:09,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:10,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:10,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-05 00:49:10,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:10,091 [ 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-05 00:49:10,100 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:10,103 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-05 00:49:10,103 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-05 00:49:10,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:10,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:10,488 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:10,527 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:10,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:10,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:10,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:10,570 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12916d0290> has no local changes
2025-04-05 00:49:10,570 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:10,577 [ scc.git] DEBUG [detached HEAD a901673] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:10,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:10,577 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:10,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:11,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-05 00:49:11,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:11,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-05 00:49:11,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:12,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-05 00:49:12,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:12,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-05 00:49:12,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:13,076 [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-05 00:49:13,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:13,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-05 00:49:13,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:14,046 [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-05 00:49:14,047 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-05 00:49:14,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:14,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-05 00:49:14,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:15,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-05 00:49:15,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:15,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-05 00:49:15,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:16,056 [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-05 00:49:16,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:16,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-05 00:49:16,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:16,990 [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-05 00:49:16,991 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-05 00:49:16,991 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:16,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-05 00:49:16,991 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:16,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:16,993 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:16,996 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:16,996 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:16,999 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:17,006 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-05 00:49:17,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:17,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-05 00:49:17,687 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-05 00:49:17,962 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-05 00:49:17,962 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-05 00:49:17,967 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-05 00:49:18,265 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-05 00:49:18,265 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-05 00:49:18,269 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:18,269 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:18,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:18,271 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-05 00:49:18,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:18,278 [ 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-05 00:49:18,290 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-05 00:49:18,290 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-05 00:49:18,290 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-05 00:49:18,290 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-05 00:49:18,291 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:49:18,291 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:49:18,294 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-05 00:49:18,298 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-05 00:49:18,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:18,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:18,465 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-05 00:49:18,469 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-05 00:49:18,472 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-05 00:49:18,474 [ scc.config] DEBUG Found github.token
2025-04-05 00:49:18,474 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-05 00:49:18,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-05 00:49:18,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:18,481 [ 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-05 00:49:18,496 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-05 00:49:18,496 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-05 00:49:18,496 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-05 00:49:18,496 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:49:18,497 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:49:18,500 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-05 00:49:18,505 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-05 00:49:18,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:18,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:18,874 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-05 00:49:18,879 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-05 00:49:18,881 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/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-05 00:49:18,884 [ scc.config] DEBUG Found github.token
2025-04-05 00:49:18,884 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-05 00:49:18,884 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:18,922 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:18,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:18,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:18,960 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:18,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1291744890> has no local changes
2025-04-05 00:49:18,965 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:18,972 [ scc.git] DEBUG [detached HEAD f4ffdf2] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:18,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:18,972 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:19,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:19,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-05 00:49:19,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:19,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-05 00:49:20,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:20,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-05 00:49:20,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:21,020 [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-05 00:49:21,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:21,517 [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-05 00:49:21,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:22,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-05 00:49:22,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:22,476 [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-05 00:49:22,476 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:49:22,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:22,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-05 00:49:22,963 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-05 00:49:23,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:23,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-05 00:49:23,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:24,039 [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-05 00:49:24,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:24,552 [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-05 00:49:24,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:25,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-05 00:49:25,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:25,473 [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-05 00:49:25,474 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-05 00:49:25,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:25,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-05 00:49:25,987 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-05 00:49:26,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:26,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-05 00:49:26,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:27,114 [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-05 00:49:27,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:27,693 [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-05 00:49:27,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:28,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-05 00:49:28,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:28,647 [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-05 00:49:28,648 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-05 00:49:28,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:29,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-05 00:49:29,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:29,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-05 00:49:29,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:30,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-05 00:49:30,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:30,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-05 00:49:30,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:31,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-05 00:49:31,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:31,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-05 00:49:31,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:32,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-05 00:49:32,226 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:32,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-05 00:49:32,226 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:32,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:32,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:32,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:32,232 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:32,234 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:32,237 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:32,238 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-05 00:49:32,541 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-05 00:49:32,541 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-05 00:49:32,545 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-05 00:49:32,811 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-05 00:49:32,811 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-05 00:49:32,815 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-05 00:49:33,071 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-05 00:49:33,071 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-05 00:49:33,076 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:33,076 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:33,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:33,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-05 00:49:33,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:33,083 [ 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-05 00:49:33,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:33,095 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-05 00:49:33,095 [ scc.git] DEBUG package.json | 2 +-
2025-04-05 00:49:33,095 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-05 00:49:33,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:33,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:33,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-05 00:49:33,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:33,267 [ 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-05 00:49:33,276 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-05 00:49:33,277 [ scc.git] DEBUG Auto-merging package.json
2025-04-05 00:49:33,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:33,281 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-05 00:49:33,281 [ scc.git] DEBUG package.json | 2 +-
2025-04-05 00:49:33,281 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-05 00:49:33,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:33,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:33,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-05 00:49:33,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:33,684 [ 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-05 00:49:33,692 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:33,695 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-05 00:49:33,695 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-05 00:49:33,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:34,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:34,084 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:34,125 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:34,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:34,128 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:34,164 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:34,169 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1291640f50> has no local changes
2025-04-05 00:49:34,169 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:34,175 [ scc.git] DEBUG [detached HEAD 3944882] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:34,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:34,175 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:34,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:34,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-05 00:49:34,515 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:34,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-05 00:49:34,515 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:34,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:34,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:34,520 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:34,520 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:34,523 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:34,526 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:34,526 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:34,526 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:34,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:34,528 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:34,565 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:34,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:34,568 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:34,606 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:34,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12916d0710> has no local changes
2025-04-05 00:49:34,610 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:34,616 [ scc.git] DEBUG [detached HEAD 756eb1d] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:34,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:34,616 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:34,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:35,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-05 00:49:35,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:35,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-05 00:49:35,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:36,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-05 00:49:36,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:36,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-05 00:49:36,510 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:36,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-05 00:49:36,510 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:36,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:36,513 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:36,515 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:36,515 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:36,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:36,521 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:36,521 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:36,521 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:36,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:36,523 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:36,561 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:36,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:36,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:36,602 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:36,605 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1291730610> has no local changes
2025-04-05 00:49:36,605 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:36,611 [ scc.git] DEBUG [detached HEAD 8a861b9] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:36,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:36,612 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:36,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:37,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-05 00:49:37,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:37,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-05 00:49:37,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:37,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-05 00:49:38,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:38,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-05 00:49:38,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:38,957 [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-05 00:49:39,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:39,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-05 00:49:39,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:39,846 [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-05 00:49:39,847 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-05 00:49:39,847 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:39,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-05 00:49:39,847 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:39,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:39,850 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:39,852 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:39,852 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:39,855 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:39,858 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:39,858 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-05 00:49:40,132 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-05 00:49:40,132 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-05 00:49:40,136 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:40,136 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:40,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:40,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-05 00:49:40,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:40,144 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-05 00:49:40,153 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG Auto-merging setup.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-05 00:49:40,153 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:49:40,154 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:49:40,156 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-05 00:49:40,161 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-05 00:49:40,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:40,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:40,336 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-05 00:49:40,339 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-05 00:49:40,342 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-04-05 00:49:40,344 [ scc.config] DEBUG Found github.token
2025-04-05 00:49:40,344 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-05 00:49:40,344 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:40,382 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:40,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:40,384 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:40,423 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:40,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1290560710> has no local changes
2025-04-05 00:49:40,427 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:40,434 [ scc.git] DEBUG [detached HEAD 149686a] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:40,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:40,434 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:40,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:40,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-05 00:49:41,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:41,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-05 00:49:41,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:41,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-05 00:49:42,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:42,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-05 00:49:42,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:42,933 [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-05 00:49:43,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:43,439 [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-05 00:49:43,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:43,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-05 00:49:44,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:44,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-05 00:49:44,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:44,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-05 00:49:45,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:45,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-05 00:49:45,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:45,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-05 00:49:46,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:46,309 [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-05 00:49:46,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:46,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-05 00:49:47,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:47,252 [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-05 00:49:47,252 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-05 00:49:47,253 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:47,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-05 00:49:47,253 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:47,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:47,256 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:47,258 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:47,258 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:47,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:47,264 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:47,264 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-05 00:49:47,556 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-05 00:49:47,556 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-05 00:49:47,560 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:47,560 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:47,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:47,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-05 00:49:47,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:47,569 [ 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-05 00:49:47,582 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-05 00:49:47,586 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-05 00:49:47,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-05 00:49:47,587 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-05 00:49:47,587 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-05 00:49:47,587 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-05 00:49:47,588 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-05 00:49:47,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:47,748 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:47,787 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:47,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:47,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:47,827 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:47,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12917307d0> has no local changes
2025-04-05 00:49:47,831 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:47,838 [ scc.git] DEBUG [detached HEAD aa0969d] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:47,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:47,839 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:48,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:48,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-05 00:49:48,191 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:48,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-05 00:49:48,191 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:48,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:48,194 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:48,196 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:48,196 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:48,199 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:48,202 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:48,202 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:48,202 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:48,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:48,204 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:48,243 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:48,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:48,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:48,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:48,287 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f129171d810> has no local changes
2025-04-05 00:49:48,287 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:48,293 [ scc.git] DEBUG [detached HEAD e7513bf] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:48,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:48,293 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:48,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:48,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-05 00:49:48,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:49,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-05 00:49:49,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:49,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-05 00:49:49,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:50,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-05 00:49:50,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:50,800 [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-05 00:49:51,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:51,293 [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-05 00:49:51,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:51,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-05 00:49:52,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:52,173 [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-05 00:49:52,173 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-05 00:49:52,173 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:52,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-05 00:49:52,173 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:52,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:52,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:49:52,178 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:52,179 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:49:52,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:49:52,184 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:52,184 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-05 00:49:52,455 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-05 00:49:52,455 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-05 00:49:52,460 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:52,460 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:52,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:52,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-05 00:49:52,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:52,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-05 00:49:52,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:49:52,478 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-05 00:49:52,478 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-05 00:49:52,478 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-05 00:49:52,478 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-05 00:49:52,478 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-05 00:49:52,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:52,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:52,634 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:52,672 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:52,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:52,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:52,711 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:52,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f129171fad0> has no local changes
2025-04-05 00:49:52,714 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:52,721 [ scc.git] DEBUG [detached HEAD 58b6be9] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:52,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:52,721 [ scc.git] INFO Overriding base-branch from master to main
2025-04-05 00:49:52,721 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:52,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:53,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-05 00:49:53,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:53,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-05 00:49:53,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:54,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-05 00:49:54,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:54,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-05 00:49:54,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:55,200 [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-05 00:49:55,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:55,699 [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-05 00:49:55,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:56,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-05 00:49:56,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:56,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-05 00:49:56,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:57,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-05 00:49:57,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:57,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-05 00:49:57,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:58,196 [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-05 00:49:58,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:58,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-05 00:49:59,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:59,207 [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-05 00:49:59,208 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-05 00:49:59,208 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:49:59,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-05 00:49:59,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:59,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:59,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-05 00:49:59,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:49:59,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-05 00:49:59,217 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-05 00:49:59,220 [ scc.git] DEBUG Already up to date.
2025-04-05 00:49:59,220 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-05 00:49:59,503 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-05 00:49:59,504 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-05 00:49:59,507 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:49:59,508 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:59,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:59,510 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-05 00:49:59,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:59,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-05 00:49:59,523 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-05 00:49:59,523 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-05 00:49:59,523 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:49:59,523 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:49:59,526 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-05 00:49:59,530 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-05 00:49:59,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:49:59,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:49:59,691 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-05 00:49:59,694 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-05 00:49:59,697 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-05 00:49:59,699 [ scc.config] DEBUG Found github.token
2025-04-05 00:49:59,699 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-05 00:49:59,699 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:49:59,737 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:49:59,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:49:59,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:49:59,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:49:59,780 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1291744a90> has no local changes
2025-04-05 00:49:59,780 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:49:59,787 [ scc.git] DEBUG [detached HEAD b862fb9] merge master -Dorg -Ssuccess-only
2025-04-05 00:49:59,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:49:59,787 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:49:59,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:00,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-05 00:50:00,121 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:50:00,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-05 00:50:00,121 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:50:00,126 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:50:00,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:50:00,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:50:00,132 [ scc.git] DEBUG Already up to date.
2025-04-05 00:50:00,132 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:50:00,132 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,134 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:50:00,172 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,174 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:50:00,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:50:00,214 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1290587d50> has no local changes
2025-04-05 00:50:00,214 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:50:00,220 [ scc.git] DEBUG [detached HEAD 3be82ca] merge master -Dorg -Ssuccess-only
2025-04-05 00:50:00,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:00,220 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:50:00,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:00,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-05 00:50:00,549 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:50:00,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-05 00:50:00,549 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,551 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:50:00,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:50:00,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:50:00,557 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:50:00,559 [ scc.git] DEBUG Already up to date.
2025-04-05 00:50:00,559 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:50:00,559 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,562 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:50:00,600 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:00,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:00,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:50:00,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:50:00,642 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f129059f790> has no local changes
2025-04-05 00:50:00,642 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:50:00,648 [ scc.git] DEBUG [detached HEAD 6bc1263] merge master -Dorg -Ssuccess-only
2025-04-05 00:50:00,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:00,648 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:50:00,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:01,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-05 00:50:01,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:01,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-05 00:50:01,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:02,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-05 00:50:02,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:02,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-05 00:50:02,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:02,993 [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-05 00:50:03,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:03,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-05 00:50:03,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:03,917 [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-05 00:50:03,917 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-05 00:50:03,917 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:50:03,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-05 00:50:03,918 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:03,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:03,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-05 00:50:03,923 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:50:03,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-05 00:50:03,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-05 00:50:03,928 [ scc.git] DEBUG Already up to date.
2025-04-05 00:50:03,928 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-05 00:50:04,209 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-05 00:50:04,209 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-05 00:50:04,213 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:50:04,213 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:04,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:04,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-05 00:50:04,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:04,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-05 00:50:04,229 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-05 00:50:04,229 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-05 00:50:04,230 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:50:04,230 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:50:04,233 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-05 00:50:04,238 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-05 00:50:04,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:04,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:04,414 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-05 00:50:04,417 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-05 00:50:04,420 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-05 00:50:04,422 [ scc.config] DEBUG Found github.token
2025-04-05 00:50:04,422 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-05 00:50:04,422 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:50:04,460 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:04,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:04,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:50:04,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:50:04,504 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f129053cfd0> has no local changes
2025-04-05 00:50:04,504 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:50:04,511 [ scc.git] DEBUG [detached HEAD 5b7c3bb] merge master -Dorg -Ssuccess-only
2025-04-05 00:50:04,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:04,511 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-05 00:50:04,511 [ scc.repo] DEBUG ## PRs found:
2025-04-05 00:50:04,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:04,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-05 00:50:05,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:05,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-05 00:50:05,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:05,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-05 00:50:06,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:06,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-05 00:50:06,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:06,867 [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-05 00:50:07,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:07,339 [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-05 00:50:07,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:07,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-05 00:50:08,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:08,209 [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-05 00:50:08,209 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-05 00:50:08,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:08,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-05 00:50:08,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:09,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-05 00:50:09,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:09,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-05 00:50:09,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:10,234 [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-05 00:50:10,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:10,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-05 00:50:10,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:11,150 [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-05 00:50:11,150 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-05 00:50:11,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:11,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-05 00:50:11,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:12,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-05 00:50:12,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:12,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-05 00:50:13,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:13,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-05 00:50:13,360 [ scc.repo] DEBUG ## Branches found:
2025-04-05 00:50:13,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-05 00:50:13,361 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:13,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:13,363 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-05 00:50:13,366 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-05 00:50:13,366 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-05 00:50:13,369 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-05 00:50:13,377 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-05 00:50:13,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:14,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-05 00:50:14,028 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-05 00:50:14,306 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-05 00:50:14,306 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-05 00:50:14,310 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-05 00:50:14,595 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-05 00:50:14,595 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-05 00:50:14,599 [ scc.git] DEBUG ## Unique users: []
2025-04-05 00:50:14,599 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:14,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:14,601 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-05 00:50:14,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:14,609 [ 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-05 00:50:14,620 [ 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-05 00:50:14,620 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-05 00:50:14,620 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-05 00:50:14,623 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-05 00:50:14,626 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-05 00:50:14,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:14,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:14,795 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-05 00:50:14,801 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-05 00:50:14,805 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#378](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-05 00:50:14,807 [ scc.config] DEBUG Found github.token
2025-04-05 00:50:14,807 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-05 00:50:14,807 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-05 00:50:14,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:14,814 [ 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-05 00:50:14,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-05 00:50:14,826 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-05 00:50:14,827 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-05 00:50:15,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:15,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:15,232 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-05 00:50:15,273 [ scc.git] DEBUG Get sha1 of %s
2025-04-05 00:50:15,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-05 00:50:15,275 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:50:15,313 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:50:15,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12905d6490> has no local changes
2025-04-05 00:50:15,317 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:50:15,323 [ scc.git] DEBUG [detached HEAD dd578aa] merge master -Dorg -Ssuccess-only
2025-04-05 00:50:15,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:15,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-05 00:50:15,395 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-05 00:50:15,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:15,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:15,648 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-05 00:50:15,650 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-05 00:50:15,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:16,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:16,054 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-05 00:50:16,056 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-05 00:50:16,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:16,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:16,462 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-05 00:50:16,464 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-05 00:50:16,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:16,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:16,885 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-05 00:50:17,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:17,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:17,294 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-05 00:50:17,296 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-05 00:50:17,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:17,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:17,704 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-05 00:50:17,706 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-05 00:50:17,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:18,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:18,119 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-05 00:50:18,121 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-05 00:50:18,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:18,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:18,535 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-05 00:50:18,537 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-05 00:50:18,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:18,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:18,968 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-05 00:50:18,970 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-05 00:50:19,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:19,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:19,393 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-05 00:50:19,395 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-05 00:50:19,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:19,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:19,803 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-05 00:50:19,804 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-05 00:50:20,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:20,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:20,221 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-05 00:50:20,223 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-05 00:50:20,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:20,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:20,635 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-05 00:50:20,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:21,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:21,084 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-05 00:50:21,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:21,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:21,496 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-05 00:50:21,498 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-05 00:50:21,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:21,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:21,907 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-05 00:50:22,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:22,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:22,332 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-05 00:50:22,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:22,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:22,735 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-05 00:50:22,737 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-05 00:50:22,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:23,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:23,147 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-05 00:50:23,149 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-05 00:50:23,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:23,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:23,568 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-05 00:50:23,570 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-05 00:50:23,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:23,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:23,975 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-05 00:50:23,977 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-05 00:50:24,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-05 00:50:24,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-05 00:50:24,386 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-05 00:50:24,386 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-05 00:50:24,473 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1293d0e310> has local changes
2025-04-05 00:50:24,473 [ 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#378 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/378/)'
2025-04-05 00:50:24,487 [ scc.git] DEBUG [detached HEAD 386b682] merge master -Dorg -Ssuccess-only
2025-04-05 00:50:24,487 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-05 00:50:24,487 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-05 00:50:24,487 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,487 [ scc.merge] INFO
2025-04-05 00:50:24,487 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,487 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-05 00:50:24,487 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-05 00:50:24,487 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-05 00:50:24,487 [ scc.merge] INFO
2025-04-05 00:50:24,487 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-05 00:50:24,487 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-05 00:50:24,488 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-05 00:50:24,488 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-05 00:50:24,488 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-05 00:50:24,488 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-05 00:50:24,488 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-05 00:50:24,488 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-05 00:50:24,488 [ scc.merge] INFO Previously merged:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-05 00:50:24,488 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-05 00:50:24,488 [ scc.merge] INFO
2025-04-05 00:50:24,488 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-05 00:50:24,488 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-05 00:50:24,489 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-05 00:50:24,489 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-05 00:50:24,489 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-05 00:50:24,489 [ scc.merge] INFO
2025-04-05 00:50:24,489 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-05 00:50:24,489 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,489 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-05 00:50:24,490 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-05 00:50:24,490 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-05 00:50:24,490 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-05 00:50:24,490 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-05 00:50:24,490 [ scc.merge] INFO Previously merged:
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-05 00:50:24,490 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-05 00:50:24,490 [ scc.merge] INFO
2025-04-05 00:50:24,490 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-05 00:50:24,490 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-05 00:50:24,491 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-05 00:50:24,491 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-05 00:50:24,491 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-05 00:50:24,491 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-05 00:50:24,491 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-05 00:50:24,491 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-05 00:50:24,491 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,491 [ scc.merge] INFO
2025-04-05 00:50:24,491 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,491 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-05 00:50:24,492 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-05 00:50:24,492 [ scc.merge] INFO Already up to date.
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-05 00:50:24,492 [ scc.merge] INFO
2025-04-05 00:50:24,492 [ scc.merge] INFO Repository: ome/scripts
2025-04-05 00:50:24,492 [ scc.merge] INFO Excluded PRs:
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-05 00:50:24,492 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-05 00:50:24,493 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-05 00:50:24,493 [ scc.merge] INFO Previously merged:
2025-04-05 00:50:24,493 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-05 00:50:24,493 [ scc.merge] INFO
2025-04-05 00:50:24,493 [ scc.merge] INFO Merged PRs:
2025-04-05 00:50:24,493 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-05 00:50:24,493 [ scc.merge] INFO
2025-04-05 00:50:24,493 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-05 00:50:24,493 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-05 00:50:24,493 [ scc.merge] INFO
2025-04-05 00:50:24,493 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-05 00:50:24,493 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-05 00:50:24,495 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-05 00:50:24,498 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-05 00:50:24,500 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-05 00:50:24,502 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-05 00:50:24,504 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-05 00:50:24,507 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-05 00:50:24,509 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-05 00:50:24,511 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-05 00:50:24,513 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-05 00:50:24,516 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-05 00:50:24,518 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-05 00:50:24,520 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-05 00:50:24,522 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-05 00:50:24,524 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-05 00:50:24,527 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-05 00:50:24,529 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-05 00:50:24,531 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-05 00:50:24,533 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-05 00:50:24,535 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-05 00:50:24,537 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-05 00:50:24,540 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-05 00:50:24,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-05 00:50:24,542 [ scc.git] DEBUG Calling 'git remote'
2025-04-05 00:50:24,544 [ 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 a7487f3] 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 37709d1] 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-05 00:51:12,326 [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-05 00:51:21,957 [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-05 00:51:24,475 [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-05 00:51:29,302 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-05 00:52:08,950 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
