Skipping 225 KB..
Full Log2025-04-06 00:40:15,910 [ scc.git] DEBUG package.json | 2 +-
2025-04-06 00:40:15,910 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-06 00:40:16,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:16,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:16,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-06 00:40:16,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:16,307 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-06 00:40:16,344 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-06 00:40:16,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-06 00:40:16,344 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:40:16,344 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:40:16,347 [ scc.git] DEBUG Calling 'git reset --hard 2f22ef2ed154d4ec11bea6bc48c960efc07a22f1'
2025-04-06 00:40:16,355 [ scc.git] DEBUG HEAD is now at 2f22ef2 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-06 00:40:16,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:16,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:16,730 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-06 00:40:16,732 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-06 00:40:16,735 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-06 00:40:16,737 [ scc.config] DEBUG Found github.token
2025-04-06 00:40:16,737 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-06 00:40:16,737 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-06 00:40:16,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:16,746 [ 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-06 00:40:16,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:16,767 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-06 00:40:16,767 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-06 00:40:16,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:17,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:17,143 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:17,181 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:17,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:17,183 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:17,219 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:17,226 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff0ecb90> has no local changes
2025-04-06 00:40:17,226 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:17,233 [ scc.git] DEBUG [detached HEAD eedfb4b] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:17,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:17,233 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:17,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:17,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-06 00:40:17,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:18,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-06 00:40:18,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:18,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-06 00:40:18,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:19,099 [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-06 00:40:19,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:19,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-06 00:40:19,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:20,052 [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-06 00:40:20,053 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:40:20,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:20,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-06 00:40:20,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:21,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-06 00:40:21,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:21,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-06 00:40:21,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:22,026 [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-06 00:40:22,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:22,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-06 00:40:22,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:22,934 [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-06 00:40:22,934 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-06 00:40:22,935 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:22,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-06 00:40:22,935 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:22,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:22,938 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:22,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:22,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:22,943 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:22,946 [ scc.git] DEBUG Already up to date.
2025-04-06 00:40:22,946 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-06 00:40:23,216 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-06 00:40:23,216 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-06 00:40:23,220 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-06 00:40:23,499 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-06 00:40:23,499 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-06 00:40:23,503 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:23,503 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:23,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:23,505 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-06 00:40:23,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:23,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-06 00:40:23,521 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:23,524 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-06 00:40:23,524 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-06 00:40:23,524 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-06 00:40:23,524 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-06 00:40:23,524 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-06 00:40:23,524 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-06 00:40:23,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:23,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:23,688 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-06 00:40:23,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:23,694 [ 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-06 00:40:23,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:23,706 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-06 00:40:23,706 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-06 00:40:23,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:24,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:24,118 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:24,156 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:24,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:24,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:24,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:24,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff1035d0> has no local changes
2025-04-06 00:40:24,200 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:24,206 [ scc.git] DEBUG [detached HEAD 9d322cf] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:24,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:24,207 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:24,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:24,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-06 00:40:24,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:25,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-06 00:40:25,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:25,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-06 00:40:25,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:26,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-06 00:40:26,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:26,667 [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-06 00:40:26,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:27,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-06 00:40:27,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:27,527 [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-06 00:40:27,528 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-06 00:40:27,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:28,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-06 00:40:28,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:28,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-06 00:40:28,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:28,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-06 00:40:29,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:29,440 [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-06 00:40:29,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:30,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-06 00:40:30,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:30,480 [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-06 00:40:30,480 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-06 00:40:30,480 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:30,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-06 00:40:30,480 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:30,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:30,483 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:30,486 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:30,486 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:30,489 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:30,496 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-06 00:40:30,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:31,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-06 00:40:31,155 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-06 00:40:31,427 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-06 00:40:31,427 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-06 00:40:31,431 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-06 00:40:31,690 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-06 00:40:31,690 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-06 00:40:31,694 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:31,694 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:31,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:31,696 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-06 00:40:31,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:31,703 [ 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-06 00:40:31,717 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-06 00:40:31,717 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-06 00:40:31,717 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-06 00:40:31,717 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-06 00:40:31,717 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:40:31,718 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:40:31,720 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-06 00:40:31,725 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-06 00:40:31,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:31,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:31,885 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-06 00:40:31,890 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-06 00:40:31,893 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-06 00:40:31,895 [ scc.config] DEBUG Found github.token
2025-04-06 00:40:31,895 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-06 00:40:31,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-06 00:40:31,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:31,902 [ 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-06 00:40:31,917 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-06 00:40:31,917 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-06 00:40:31,917 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-06 00:40:31,918 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:40:31,918 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:40:31,921 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-06 00:40:31,926 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-06 00:40:32,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:32,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:32,357 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-06 00:40:32,362 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-06 00:40:32,365 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/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-06 00:40:32,367 [ scc.config] DEBUG Found github.token
2025-04-06 00:40:32,367 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-06 00:40:32,367 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:32,405 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:32,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:32,407 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:32,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:32,448 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff1bd890> has no local changes
2025-04-06 00:40:32,449 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:32,455 [ scc.git] DEBUG [detached HEAD 0482059] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:32,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:32,455 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:32,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:32,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-06 00:40:33,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:33,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-06 00:40:33,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:33,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-06 00:40:34,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:34,510 [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-06 00:40:34,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:35,009 [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-06 00:40:35,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:35,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-06 00:40:35,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:35,957 [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-06 00:40:35,958 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:40:36,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:36,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-06 00:40:36,457 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-06 00:40:36,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:37,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-06 00:40:37,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:37,537 [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-06 00:40:37,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:38,074 [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-06 00:40:38,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:38,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-06 00:40:38,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:38,950 [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-06 00:40:38,950 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-06 00:40:39,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:39,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-06 00:40:39,435 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-06 00:40:39,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:39,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-06 00:40:40,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:40,481 [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-06 00:40:40,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:41,007 [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-06 00:40:41,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:41,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-06 00:40:41,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:42,033 [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-06 00:40:42,034 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-06 00:40:42,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:42,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-06 00:40:42,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:42,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-06 00:40:43,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:43,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-06 00:40:43,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:43,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-06 00:40:44,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:44,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-06 00:40:44,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:44,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-06 00:40:45,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:45,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-06 00:40:45,463 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:45,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-06 00:40:45,463 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:45,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:45,466 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:45,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:45,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:45,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:45,475 [ scc.git] DEBUG Already up to date.
2025-04-06 00:40:45,475 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-06 00:40:45,748 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-06 00:40:45,748 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-06 00:40:45,752 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-06 00:40:46,029 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-06 00:40:46,029 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-06 00:40:46,033 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-06 00:40:46,289 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-06 00:40:46,289 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-06 00:40:46,293 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:46,293 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:46,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:46,295 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-06 00:40:46,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:46,300 [ 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-06 00:40:46,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:46,311 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-06 00:40:46,311 [ scc.git] DEBUG package.json | 2 +-
2025-04-06 00:40:46,311 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-06 00:40:46,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:46,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:46,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-06 00:40:46,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:46,476 [ 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-06 00:40:46,486 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-06 00:40:46,486 [ scc.git] DEBUG Auto-merging package.json
2025-04-06 00:40:46,487 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:46,490 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-06 00:40:46,490 [ scc.git] DEBUG package.json | 2 +-
2025-04-06 00:40:46,490 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-06 00:40:46,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:46,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:46,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-06 00:40:46,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:46,905 [ 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-06 00:40:46,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:40:46,917 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-06 00:40:46,917 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-06 00:40:47,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:47,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:47,307 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:47,346 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:47,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:47,348 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:47,387 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:47,391 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff0dd3d0> has no local changes
2025-04-06 00:40:47,391 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:47,397 [ scc.git] DEBUG [detached HEAD d45688e] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:47,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:47,398 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:47,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:47,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-06 00:40:47,739 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:47,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-06 00:40:47,739 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:47,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:47,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:47,744 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:47,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:47,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:47,750 [ scc.git] DEBUG Already up to date.
2025-04-06 00:40:47,750 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:47,750 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:47,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:47,752 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:47,791 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:47,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:47,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:47,831 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:47,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff005b10> has no local changes
2025-04-06 00:40:47,835 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:47,841 [ scc.git] DEBUG [detached HEAD 3443572] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:47,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:47,841 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:47,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:48,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-06 00:40:48,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:48,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-06 00:40:49,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:49,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-06 00:40:49,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:49,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-06 00:40:49,830 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:49,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-06 00:40:49,830 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:49,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:49,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:49,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:49,836 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:49,839 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:49,842 [ scc.git] DEBUG Already up to date.
2025-04-06 00:40:49,843 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:49,843 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:49,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:49,845 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:49,884 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:49,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:49,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:49,924 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:49,927 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fff80710> has no local changes
2025-04-06 00:40:49,928 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:49,934 [ scc.git] DEBUG [detached HEAD 6cc955f] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:49,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:49,934 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:50,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:50,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-06 00:40:50,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:50,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-06 00:40:51,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:51,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-06 00:40:51,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:51,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-06 00:40:52,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:52,377 [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-06 00:40:52,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:52,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-06 00:40:53,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:53,366 [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-06 00:40:53,366 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-06 00:40:53,366 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:40:53,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-06 00:40:53,366 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:53,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:53,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:40:53,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:40:53,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:40:53,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:40:53,378 [ scc.git] DEBUG Already up to date.
2025-04-06 00:40:53,378 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-06 00:40:53,676 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-06 00:40:53,676 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-06 00:40:53,681 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:40:53,681 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:53,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:53,684 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-06 00:40:53,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:53,689 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-06 00:40:53,698 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG Auto-merging setup.py
2025-04-06 00:40:53,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-06 00:40:53,699 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:40:53,699 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:40:53,701 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-06 00:40:53,706 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-06 00:40:53,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:53,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:40:53,882 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-06 00:40:53,886 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-06 00:40:53,889 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-04-06 00:40:53,891 [ scc.config] DEBUG Found github.token
2025-04-06 00:40:53,891 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-06 00:40:53,891 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:40:53,929 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:40:53,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:40:53,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:40:53,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:40:53,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fc7284d0> has no local changes
2025-04-06 00:40:53,972 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:40:53,978 [ scc.git] DEBUG [detached HEAD b462370] merge master -Dorg -Ssuccess-only
2025-04-06 00:40:53,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:40:53,978 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:40:54,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:54,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-06 00:40:54,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:54,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-06 00:40:55,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:55,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-06 00:40:55,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:55,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-06 00:40:56,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:56,364 [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-06 00:40:56,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:56,835 [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-06 00:40:57,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:57,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-06 00:40:57,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:57,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-06 00:40:58,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:58,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-06 00:40:58,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:58,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-06 00:40:58,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:59,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-06 00:40:59,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:40:59,701 [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-06 00:40:59,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:00,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-06 00:41:00,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:00,620 [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-06 00:41:00,621 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-06 00:41:00,621 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:00,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-06 00:41:00,621 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:00,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:00,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:00,626 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:00,626 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:00,629 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:00,633 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:00,633 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-06 00:41:00,902 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-06 00:41:00,902 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-06 00:41:00,906 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:00,906 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:00,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:00,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-06 00:41:00,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:00,915 [ 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-06 00:41:00,928 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-06 00:41:00,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-06 00:41:00,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-06 00:41:00,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-06 00:41:00,933 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-06 00:41:00,933 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-06 00:41:00,933 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-06 00:41:00,934 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-06 00:41:00,934 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-06 00:41:01,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:01,098 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:01,138 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:01,138 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:01,140 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:01,178 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:01,182 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff0ed6d0> has no local changes
2025-04-06 00:41:01,182 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:01,189 [ scc.git] DEBUG [detached HEAD 26fd976] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:01,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:01,189 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:01,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:01,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-06 00:41:01,526 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:01,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-06 00:41:01,526 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:01,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:01,528 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:01,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:01,531 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:01,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:01,537 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:01,537 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:01,537 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:01,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:01,539 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:01,578 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:01,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:01,580 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:01,618 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:01,621 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fc6e52d0> has no local changes
2025-04-06 00:41:01,621 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:01,627 [ scc.git] DEBUG [detached HEAD 4973ab2] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:01,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:01,628 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:01,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:02,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-06 00:41:02,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:02,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-06 00:41:02,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:03,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-06 00:41:03,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:03,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-06 00:41:03,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:04,046 [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-06 00:41:04,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:04,572 [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-06 00:41:04,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:05,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-06 00:41:05,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:05,546 [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-06 00:41:05,547 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-06 00:41:05,547 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:05,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-06 00:41:05,547 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:05,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:05,549 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:05,552 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:05,552 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:05,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:05,558 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:05,558 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-06 00:41:05,849 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-06 00:41:05,849 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-06 00:41:05,853 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:05,853 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:05,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:05,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-06 00:41:05,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:05,860 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-06 00:41:05,868 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:41:05,870 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-06 00:41:05,870 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-06 00:41:05,870 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-06 00:41:05,870 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-06 00:41:05,870 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-06 00:41:05,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:06,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:06,032 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:06,072 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:06,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:06,075 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:06,112 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:06,116 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff2c88d0> has no local changes
2025-04-06 00:41:06,116 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:06,122 [ scc.git] DEBUG [detached HEAD d84c593] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:06,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:06,123 [ scc.git] INFO Overriding base-branch from master to main
2025-04-06 00:41:06,123 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:06,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:06,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-06 00:41:06,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:06,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-06 00:41:07,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:07,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-06 00:41:07,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:07,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-06 00:41:08,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:08,512 [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-06 00:41:08,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:09,014 [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-06 00:41:09,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:09,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-06 00:41:09,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:09,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-06 00:41:10,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:10,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-06 00:41:10,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:10,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-06 00:41:11,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:11,445 [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-06 00:41:11,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:11,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-06 00:41:12,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:12,409 [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-06 00:41:12,410 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-06 00:41:12,410 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:12,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-06 00:41:12,410 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:12,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:12,413 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-06 00:41:12,416 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:12,416 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-06 00:41:12,419 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-06 00:41:12,422 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:12,422 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-06 00:41:12,696 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-06 00:41:12,696 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-06 00:41:12,701 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:12,701 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:12,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:12,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-06 00:41:12,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:12,709 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-06 00:41:12,716 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-06 00:41:12,717 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-06 00:41:12,717 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:41:12,717 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:41:12,720 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-06 00:41:12,724 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-06 00:41:12,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:12,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:12,887 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-06 00:41:12,890 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-06 00:41:12,893 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-06 00:41:12,895 [ scc.config] DEBUG Found github.token
2025-04-06 00:41:12,895 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-06 00:41:12,895 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:12,934 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:12,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:12,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:12,974 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:12,978 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fc766810> has no local changes
2025-04-06 00:41:12,979 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:12,985 [ scc.git] DEBUG [detached HEAD 70db80c] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:12,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:12,985 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:13,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:13,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-06 00:41:13,318 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:13,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-06 00:41:13,318 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,321 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:13,323 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:13,323 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:13,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:13,329 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:13,329 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:13,329 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,332 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:13,369 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,371 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:13,408 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:13,411 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff2d66d0> has no local changes
2025-04-06 00:41:13,411 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:13,417 [ scc.git] DEBUG [detached HEAD 6ab4080] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:13,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:13,417 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:13,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:13,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-06 00:41:13,763 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:13,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-06 00:41:13,763 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:13,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:13,768 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:13,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:13,775 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:13,775 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:13,775 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,777 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:13,815 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:13,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:13,818 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:13,856 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:13,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fc6f8350> has no local changes
2025-04-06 00:41:13,860 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:13,866 [ scc.git] DEBUG [detached HEAD 5abf2ed] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:13,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:13,866 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:14,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:14,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-06 00:41:14,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:14,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-06 00:41:14,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:15,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-06 00:41:15,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:15,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-06 00:41:16,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:16,221 [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-06 00:41:16,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:16,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-06 00:41:16,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:17,139 [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-06 00:41:17,139 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-06 00:41:17,139 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:17,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-06 00:41:17,139 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:17,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:17,142 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-06 00:41:17,145 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:17,145 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-06 00:41:17,148 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-06 00:41:17,151 [ scc.git] DEBUG Already up to date.
2025-04-06 00:41:17,151 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-06 00:41:17,446 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-06 00:41:17,446 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-06 00:41:17,450 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:17,450 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:17,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:17,453 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-06 00:41:17,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:17,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-06 00:41:17,467 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-06 00:41:17,467 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-06 00:41:17,467 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:41:17,467 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:41:17,470 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-06 00:41:17,475 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-06 00:41:17,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:17,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:17,629 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-06 00:41:17,632 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-06 00:41:17,635 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-06 00:41:17,637 [ scc.config] DEBUG Found github.token
2025-04-06 00:41:17,637 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-06 00:41:17,637 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:17,675 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:17,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:17,677 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:17,715 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:17,719 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41fc79f5d0> has no local changes
2025-04-06 00:41:17,719 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:17,726 [ scc.git] DEBUG [detached HEAD b105374] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:17,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:17,726 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-06 00:41:17,726 [ scc.repo] DEBUG ## PRs found:
2025-04-06 00:41:17,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:18,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-06 00:41:18,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:18,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-06 00:41:18,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:19,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-06 00:41:19,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:19,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-06 00:41:19,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:20,034 [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-06 00:41:20,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:20,477 [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-06 00:41:20,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:20,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-06 00:41:21,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:21,425 [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-06 00:41:21,426 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-06 00:41:21,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:21,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-06 00:41:22,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:22,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-06 00:41:22,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:22,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-06 00:41:23,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:23,322 [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-06 00:41:23,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:23,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-06 00:41:24,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:24,197 [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-06 00:41:24,198 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-06 00:41:24,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:24,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-06 00:41:24,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:25,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-06 00:41:25,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:25,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-06 00:41:25,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:26,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-06 00:41:26,208 [ scc.repo] DEBUG ## Branches found:
2025-04-06 00:41:26,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-06 00:41:26,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:26,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:26,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-06 00:41:26,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-06 00:41:26,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-06 00:41:26,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-06 00:41:26,225 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-06 00:41:26,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:26,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-06 00:41:26,818 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-06 00:41:27,145 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-06 00:41:27,145 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-06 00:41:27,150 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-06 00:41:27,413 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-06 00:41:27,413 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-06 00:41:27,418 [ scc.git] DEBUG ## Unique users: []
2025-04-06 00:41:27,418 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:27,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:27,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-06 00:41:27,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:27,428 [ 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-06 00:41:27,438 [ 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-06 00:41:27,439 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-06 00:41:27,439 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-06 00:41:27,441 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-06 00:41:27,445 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-06 00:41:27,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:27,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:27,610 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-06 00:41:27,616 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-06 00:41:27,619 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#379](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-06 00:41:27,622 [ scc.config] DEBUG Found github.token
2025-04-06 00:41:27,622 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-06 00:41:27,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-06 00:41:27,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:27,629 [ 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-06 00:41:27,638 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-06 00:41:27,641 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-06 00:41:27,641 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-06 00:41:27,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:28,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:28,015 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-06 00:41:28,054 [ scc.git] DEBUG Get sha1 of %s
2025-04-06 00:41:28,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-06 00:41:28,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:28,095 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:28,099 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff2d9250> has no local changes
2025-04-06 00:41:28,099 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:28,106 [ scc.git] DEBUG [detached HEAD 664cece] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:28,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:28,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-06 00:41:28,185 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-06 00:41:28,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:28,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:28,428 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-06 00:41:28,431 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-06 00:41:28,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:28,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:28,840 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-06 00:41:28,842 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-06 00:41:29,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:29,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:29,242 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-06 00:41:29,244 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-06 00:41:29,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:29,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:29,674 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-06 00:41:29,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:30,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:30,092 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-06 00:41:30,094 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-06 00:41:30,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:30,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:30,514 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-06 00:41:30,516 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-06 00:41:30,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:30,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:30,925 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-06 00:41:30,927 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-06 00:41:31,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:31,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:31,338 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-06 00:41:31,340 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-06 00:41:31,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:31,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:31,753 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-06 00:41:31,755 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-06 00:41:31,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:32,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:32,173 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-06 00:41:32,175 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-06 00:41:32,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:32,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:32,584 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-06 00:41:32,586 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-06 00:41:32,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:32,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:33,000 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-06 00:41:33,002 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-06 00:41:33,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:33,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:33,416 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-06 00:41:33,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:33,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:33,835 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-06 00:41:34,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:34,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:34,244 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-06 00:41:34,246 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-06 00:41:34,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:34,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:34,656 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-06 00:41:34,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:35,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:35,070 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-06 00:41:35,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:35,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:35,479 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-06 00:41:35,481 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-06 00:41:35,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:35,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:35,907 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-06 00:41:35,909 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-06 00:41:36,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:36,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:36,313 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-06 00:41:36,315 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-06 00:41:36,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:36,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:36,726 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-06 00:41:36,728 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-06 00:41:36,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-06 00:41:37,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-06 00:41:37,137 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-06 00:41:37,137 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-06 00:41:37,225 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f41ff2d8c50> has local changes
2025-04-06 00:41:37,225 [ 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#379 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/379/)'
2025-04-06 00:41:37,239 [ scc.git] DEBUG [detached HEAD bb3be83] merge master -Dorg -Ssuccess-only
2025-04-06 00:41:37,239 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-06 00:41:37,239 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-06 00:41:37,239 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,239 [ scc.merge] INFO
2025-04-06 00:41:37,239 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,239 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-06 00:41:37,239 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-06 00:41:37,239 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-06 00:41:37,239 [ scc.merge] INFO
2025-04-06 00:41:37,239 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-06 00:41:37,239 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,239 [ scc.merge] INFO
2025-04-06 00:41:37,239 [ scc.merge] INFO
2025-04-06 00:41:37,239 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-06 00:41:37,239 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-06 00:41:37,240 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-06 00:41:37,240 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-06 00:41:37,240 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-06 00:41:37,240 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-06 00:41:37,240 [ scc.merge] INFO Previously merged:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-06 00:41:37,240 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-06 00:41:37,240 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,240 [ scc.merge] INFO
2025-04-06 00:41:37,240 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,240 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-06 00:41:37,241 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-06 00:41:37,241 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-06 00:41:37,241 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-06 00:41:37,241 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,241 [ scc.merge] INFO
2025-04-06 00:41:37,241 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,241 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-06 00:41:37,242 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-06 00:41:37,242 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-06 00:41:37,242 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-06 00:41:37,242 [ scc.merge] INFO Previously merged:
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-06 00:41:37,242 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-06 00:41:37,242 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-06 00:41:37,242 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-06 00:41:37,242 [ scc.merge] INFO
2025-04-06 00:41:37,242 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-06 00:41:37,242 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-06 00:41:37,243 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-06 00:41:37,243 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,243 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-06 00:41:37,243 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-06 00:41:37,243 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-06 00:41:37,243 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,243 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-06 00:41:37,244 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-06 00:41:37,244 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-06 00:41:37,244 [ scc.merge] INFO Already up to date.
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Repository: ome/scripts
2025-04-06 00:41:37,244 [ scc.merge] INFO Excluded PRs:
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-06 00:41:37,244 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-06 00:41:37,244 [ scc.merge] INFO Previously merged:
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Merged PRs:
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-06 00:41:37,244 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-06 00:41:37,244 [ scc.merge] INFO
2025-04-06 00:41:37,244 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-06 00:41:37,244 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-06 00:41:37,247 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-06 00:41:37,249 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-06 00:41:37,251 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-06 00:41:37,253 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-06 00:41:37,255 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-06 00:41:37,258 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-06 00:41:37,260 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-06 00:41:37,262 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-06 00:41:37,264 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-06 00:41:37,267 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-06 00:41:37,269 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-06 00:41:37,271 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-06 00:41:37,273 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-06 00:41:37,276 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-06 00:41:37,278 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-06 00:41:37,280 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-06 00:41:37,282 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-06 00:41:37,284 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-06 00:41:37,287 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-06 00:41:37,289 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-06 00:41:37,291 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-06 00:41:37,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-06 00:41:37,293 [ scc.git] DEBUG Calling 'git remote'
2025-04-06 00:41:37,295 [ 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 ef63b58] 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 7abc0f1] 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-06 00:42:24,256 [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-06 00:42:33,872 [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-06 00:42:36,410 [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-06 00:42:41,167 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-06 00:43:20,199 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/861d2fbf/images/svgs/logo.svg){kind=logo}
