Skipping 97 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-03 00:44:25,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:44:25,408 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:44:25,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2025-01-03 00:44:26,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2025-01-03 00:44:26,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2025-01-03 00:44:27,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2025-01-03 00:44:27,285 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:44:27,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-03 00:44:27,285 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:27,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:27,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:44:27,297 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:44:27,297 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:44:27,302 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:44:27,308 [ scc.git] DEBUG Already up to date.
2025-01-03 00:44:27,308 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:44:27,308 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:27,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:27,313 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:44:27,352 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:27,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:27,357 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:44:27,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:44:27,402 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c79f34580> has no local changes
2025-01-03 00:44:27,402 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:44:27,411 [ scc.git] DEBUG [detached HEAD 7e157234] merge master -Dorg -Ssuccess-only
2025-01-03 00:44:27,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:44:27,411 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:44:27,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-03 00:44:28,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-03 00:44:28,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-03 00:44:29,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-03 00:44:29,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:30,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-03 00:44:30,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:30,700 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-03 00:44:30,700 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:44:30,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-03 00:44:30,700 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:30,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:30,706 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:44:30,711 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:44:30,711 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:44:30,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:44:30,724 [ scc.git] DEBUG Already up to date.
2025-01-03 00:44:30,725 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-03 00:44:31,109 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-03 00:44:31,109 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-03 00:44:31,114 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:44:31,114 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:31,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:31,120 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-03 00:44:31,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:31,133 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-03 00:44:31,200 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-03 00:44:31,200 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:44:31,204 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-03 00:44:31,204 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-03 00:44:31,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:31,370 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:44:31,414 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:31,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:31,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:44:31,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:44:31,473 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c79f239a0> has no local changes
2025-01-03 00:44:31,473 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:44:31,482 [ scc.git] DEBUG [detached HEAD dfb7a56] merge master -Dorg -Ssuccess-only
2025-01-03 00:44:31,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:44:31,482 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:44:31,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-03 00:44:32,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-03 00:44:32,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-03 00:44:33,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-03 00:44:33,339 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:33,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-03 00:44:34,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:35,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:35,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-03 00:44:35,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:35,945 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-03 00:44:36,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-03 00:44:36,414 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:37,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-03 00:44:37,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:38,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:38,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-03 00:44:38,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:38,996 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-03 00:44:39,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-03 00:44:39,559 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:40,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-03 00:44:40,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:41,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:41,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-03 00:44:41,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:41,959 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-03 00:44:42,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-03 00:44:42,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-03 00:44:42,849 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:43,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-03 00:44:43,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:45,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-03 00:44:45,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:45,423 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-03 00:44:45,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-03 00:44:45,871 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:46,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-03 00:44:46,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:47,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:48,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-03 00:44:48,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:48,421 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-03 00:44:48,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-03 00:44:48,908 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:49,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-03 00:44:49,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:50,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:51,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-03 00:44:51,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:51,416 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-03 00:44:51,416 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:44:51,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-03 00:44:51,416 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:51,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:51,422 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:44:51,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:44:51,428 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:44:51,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:44:51,441 [ scc.git] DEBUG Already up to date.
2025-01-03 00:44:51,441 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-03 00:44:51,741 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:51,741 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-03 00:44:51,746 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-03 00:44:52,056 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:52,056 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-03 00:44:52,062 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-03 00:44:52,379 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:52,380 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-03 00:44:52,386 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-03 00:44:52,702 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:52,703 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-03 00:44:52,708 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-03 00:44:53,005 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:53,005 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-03 00:44:53,010 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-03 00:44:53,291 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-03 00:44:53,291 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-03 00:44:53,296 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:44:53,296 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:53,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:53,303 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-03 00:44:53,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:53,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-03 00:44:53,514 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:44:53,519 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-03 00:44:53,519 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-03 00:44:53,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:53,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-03 00:44:53,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:53,732 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-03 00:44:53,846 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-03 00:44:53,847 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:44:53,853 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-03 00:44:53,853 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-03 00:44:54,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:54,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-03 00:44:54,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:54,143 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-03 00:44:54,274 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-03 00:44:54,274 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-03 00:44:54,274 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:44:54,275 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:44:54,282 [ scc.git] DEBUG Calling 'git reset --hard 4e94511fa41dfe67588e977eabc272954f92bedc'
2025-01-03 00:44:54,291 [ scc.git] DEBUG HEAD is now at 4e94511 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-03 00:44:54,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:54,456 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-03 00:44:54,465 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-03 00:44:54,471 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-03 00:44:54,476 [ scc.config] DEBUG Found github.token
2025-01-03 00:44:54,476 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-03 00:44:54,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-03 00:44:54,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:54,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-03 00:44:54,605 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-03 00:44:54,605 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:44:54,610 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-03 00:44:54,610 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-03 00:44:54,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:54,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-03 00:44:54,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:54,915 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-03 00:44:54,948 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-03 00:44:54,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:44:54,954 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-03 00:44:54,954 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-03 00:44:55,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:55,249 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-03 00:44:55,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:55,263 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-03 00:44:55,376 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-03 00:44:55,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-03 00:44:55,376 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:44:55,377 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:44:55,383 [ scc.git] DEBUG Calling 'git reset --hard eb915997a4ed61d61785a4e792ee97652db35116'
2025-01-03 00:44:55,390 [ scc.git] DEBUG HEAD is now at eb91599 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-03 00:44:55,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:44:55,631 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-03 00:44:55,637 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-03 00:44:55,643 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-03 00:44:55,649 [ scc.config] DEBUG Found github.token
2025-01-03 00:44:55,650 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-03 00:44:55,650 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:44:55,691 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:44:55,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:44:55,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:44:55,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:44:55,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c79f10b20> has no local changes
2025-01-03 00:44:55,749 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
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'
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:44:55,758 [ scc.git] DEBUG [detached HEAD 70688f6] merge master -Dorg -Ssuccess-only
2025-01-03 00:44:55,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:44:55,759 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:44:56,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-03 00:44:56,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-03 00:44:56,643 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-03 00:44:57,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-03 00:44:57,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:44:58,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:44:58,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-03 00:44:59,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:44:59,177 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-03 00:44:59,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-03 00:45:00,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-03 00:45:00,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-03 00:45:01,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-03 00:45:01,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-03 00:45:02,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:45:02,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:45:03,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-03 00:45:03,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:03,536 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-03 00:45:03,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-03 00:45:04,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-03 00:45:05,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-03 00:45:05,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:45:06,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-03 00:45:06,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-03 00:45:06,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:06,981 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-03 00:45:07,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-03 00:45:07,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-03 00:45:08,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-03 00:45:08,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:45:09,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-03 00:45:09,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:09,802 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-03 00:45:09,802 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:09,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-03 00:45:09,802 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:09,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:09,809 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:09,814 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:09,814 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:09,820 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:09,827 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:09,827 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-03 00:45:12,157 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-03 00:45:12,157 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-03 00:45:12,162 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-03 00:45:13,855 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-03 00:45:13,855 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-03 00:45:13,861 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-03 00:45:14,293 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-03 00:45:14,293 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-03 00:45:14,298 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-03 00:45:14,605 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-03 00:45:14,605 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-03 00:45:14,610 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:14,610 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:14,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:14,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-03 00:45:14,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:14,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-03 00:45:14,714 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-03 00:45:14,714 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:14,718 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-03 00:45:14,719 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-03 00:45:14,719 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-03 00:45:14,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:14,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-03 00:45:14,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:14,882 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-03 00:45:15,144 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-03 00:45:15,144 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-03 00:45:15,144 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-03 00:45:15,144 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-03 00:45:15,144 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:15,149 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-03 00:45:15,149 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-03 00:45:15,149 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-03 00:45:15,149 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-03 00:45:15,149 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-03 00:45:15,149 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-03 00:45:15,149 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-03 00:45:15,149 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-03 00:45:15,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:15,291 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-03 00:45:15,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:15,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-03 00:45:15,592 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-03 00:45:15,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:15,597 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-03 00:45:15,597 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-03 00:45:15,597 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-03 00:45:15,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:15,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-03 00:45:15,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:15,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-03 00:45:15,939 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:15,950 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-03 00:45:15,950 [ scc.git] DEBUG package.json | 2 +-
2025-01-03 00:45:15,950 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-03 00:45:16,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:16,111 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:16,153 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:16,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:16,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:16,200 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:16,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c79f04bb0> has no local changes
2025-01-03 00:45:16,211 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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)
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'
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:16,224 [ scc.git] DEBUG [detached HEAD 7db6c4c] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:16,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:16,224 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:16,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-03 00:45:17,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-03 00:45:17,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-03 00:45:18,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-03 00:45:18,553 [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-01-03 00:45:19,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-03 00:45:19,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:19,494 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-03 00:45:19,494 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:19,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-03 00:45:19,495 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:19,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:19,502 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:19,518 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:19,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:19,532 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:19,539 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:19,539 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-03 00:45:20,202 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-03 00:45:20,202 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-03 00:45:20,207 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:20,208 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:20,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:20,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-03 00:45:20,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:20,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-03 00:45:20,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:20,241 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-03 00:45:20,241 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-03 00:45:20,241 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-03 00:45:20,241 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-03 00:45:20,241 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-03 00:45:20,241 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-03 00:45:20,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:20,388 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:20,431 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:20,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:20,438 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:20,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:20,488 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c786aa5b0> has no local changes
2025-01-03 00:45:20,489 [ 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'
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:20,498 [ scc.git] DEBUG [detached HEAD cf64bea] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:20,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:20,499 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:20,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-03 00:45:21,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-03 00:45:21,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-03 00:45:22,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-03 00:45:22,969 [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-01-03 00:45:23,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-03 00:45:23,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:23,858 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-03 00:45:24,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-03 00:45:24,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-03 00:45:25,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-03 00:45:25,741 [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-01-03 00:45:26,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-03 00:45:26,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:26,567 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-03 00:45:26,567 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:26,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-03 00:45:26,568 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:26,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:26,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:26,580 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:26,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:26,585 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:26,591 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:26,591 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-03 00:45:27,325 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-03 00:45:27,325 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-03 00:45:27,330 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-03 00:45:27,865 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-03 00:45:27,866 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-03 00:45:27,870 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:27,870 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:27,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:27,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-03 00:45:27,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:27,890 [ 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-01-03 00:45:28,071 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-03 00:45:28,071 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-03 00:45:28,071 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-03 00:45:28,071 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-03 00:45:28,071 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:45:28,072 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:45:28,078 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-03 00:45:28,085 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-03 00:45:28,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:28,220 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-03 00:45:28,229 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-03 00:45:28,373 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-03 00:45:28,379 [ scc.config] DEBUG Found github.token
2025-01-03 00:45:28,380 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-03 00:45:28,380 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-03 00:45:28,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:28,394 [ 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-01-03 00:45:28,497 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-03 00:45:28,497 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-03 00:45:28,497 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-03 00:45:28,497 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:45:28,498 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:45:28,505 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-03 00:45:28,512 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-03 00:45:28,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:28,663 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-03 00:45:28,671 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-03 00:45:28,678 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/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-01-03 00:45:28,683 [ scc.config] DEBUG Found github.token
2025-01-03 00:45:28,683 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-03 00:45:28,683 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:28,727 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:28,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:28,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:28,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:28,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c786beb80> has no local changes
2025-01-03 00:45:28,781 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:28,792 [ scc.git] DEBUG [detached HEAD aa07dac] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:28,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:28,793 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:29,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-03 00:45:29,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-03 00:45:30,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-03 00:45:30,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-03 00:45:31,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-03 00:45:31,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-03 00:45:32,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-03 00:45:32,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-03 00:45:32,571 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:32,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-03 00:45:32,571 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:32,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:32,577 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:32,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:32,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:32,589 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:32,595 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:32,595 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:32,595 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:32,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:32,600 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:32,646 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:32,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:32,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:32,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:32,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c786a5f40> has no local changes
2025-01-03 00:45:32,703 [ 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.
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:32,713 [ scc.git] DEBUG [detached HEAD d95fd6e] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:32,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:32,714 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:32,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-03 00:45:32,968 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:32,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-03 00:45:32,968 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:32,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:32,974 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:32,979 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:32,980 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:32,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:32,991 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:32,991 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:32,991 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:32,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:32,996 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:33,038 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:33,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:33,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:33,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:33,091 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c78660940> has no local changes
2025-01-03 00:45:33,091 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:33,100 [ scc.git] DEBUG [detached HEAD 1f061d0] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:33,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:33,100 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:33,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-03 00:45:33,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-03 00:45:34,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-03 00:45:34,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-03 00:45:35,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-03 00:45:36,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-03 00:45:36,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:36,424 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-03 00:45:36,424 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:36,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-03 00:45:36,424 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:36,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:36,431 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:36,437 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:36,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:36,445 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:36,451 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:36,451 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-03 00:45:36,861 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-03 00:45:36,861 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-03 00:45:36,866 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:36,866 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:36,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:36,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-03 00:45:36,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:36,886 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-03 00:45:36,897 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-03 00:45:36,898 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:36,900 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-03 00:45:36,900 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-03 00:45:37,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:37,063 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:37,107 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:37,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:37,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:37,156 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:37,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c7861a5e0> has no local changes
2025-01-03 00:45:37,164 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:37,173 [ scc.git] DEBUG [detached HEAD 385c724] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:37,174 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:37,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-03 00:45:38,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-03 00:45:38,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-03 00:45:39,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-03 00:45:39,487 [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-01-03 00:45:40,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-03 00:45:40,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:45:40,449 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-03 00:45:40,449 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:40,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-03 00:45:40,449 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:40,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:40,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:40,464 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:40,464 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:40,470 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:40,476 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:40,476 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-03 00:45:40,803 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-03 00:45:40,803 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-03 00:45:40,808 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:40,808 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:40,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:40,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-03 00:45:40,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:40,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-03 00:45:41,150 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG Auto-merging setup.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-03 00:45:41,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:45:41,151 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:45:41,158 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-03 00:45:41,166 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-03 00:45:41,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:41,306 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-03 00:45:41,313 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-03 00:45:41,454 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-01-03 00:45:41,460 [ scc.config] DEBUG Found github.token
2025-01-03 00:45:41,460 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-03 00:45:41,460 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:41,504 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:41,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:41,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:41,552 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:41,558 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c7861a7f0> has no local changes
2025-01-03 00:45:41,558 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:41,567 [ scc.git] DEBUG [detached HEAD 300a0d7] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:41,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:41,568 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:41,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-03 00:45:42,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-03 00:45:42,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-03 00:45:43,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-03 00:45:43,802 [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-01-03 00:45:44,358 [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-01-03 00:45:44,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-03 00:45:45,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-03 00:45:45,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-03 00:45:46,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-03 00:45:46,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-03 00:45:47,215 [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-01-03 00:45:47,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-03 00:45:48,087 [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-01-03 00:45:48,087 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-03 00:45:48,088 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:48,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-03 00:45:48,088 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:48,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:48,094 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:48,099 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:48,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:48,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:48,110 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:48,110 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-03 00:45:48,619 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-03 00:45:48,619 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-03 00:45:48,625 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:48,625 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:48,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:48,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-03 00:45:48,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:48,646 [ 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-01-03 00:45:48,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-03 00:45:48,713 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-03 00:45:48,715 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-03 00:45:48,716 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-03 00:45:48,716 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-03 00:45:48,716 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-03 00:45:48,716 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-03 00:45:48,716 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-03 00:45:48,717 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-03 00:45:48,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:48,905 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:48,946 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:48,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:48,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:48,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:48,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c7861a640> has no local changes
2025-01-03 00:45:48,999 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:49,010 [ scc.git] DEBUG [detached HEAD 34168bb] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:49,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:49,010 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:49,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-03 00:45:49,321 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:49,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-03 00:45:49,321 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:49,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:49,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:49,332 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:49,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:49,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:49,343 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:49,343 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:49,343 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:49,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:49,348 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:49,392 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:49,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:49,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:49,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:49,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c786594c0> has no local changes
2025-01-03 00:45:49,477 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:49,486 [ scc.git] DEBUG [detached HEAD 7291ed0] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:49,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:49,486 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:49,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-03 00:45:50,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-03 00:45:50,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-03 00:45:51,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-03 00:45:51,811 [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-01-03 00:45:52,259 [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-01-03 00:45:52,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-03 00:45:53,197 [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-01-03 00:45:53,198 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-03 00:45:53,198 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:45:53,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-03 00:45:53,198 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:53,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:53,204 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:45:53,210 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:45:53,210 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:45:53,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:45:53,222 [ scc.git] DEBUG Already up to date.
2025-01-03 00:45:53,223 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-03 00:45:53,693 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-03 00:45:53,693 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-03 00:45:53,698 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:45:53,698 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:53,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:53,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-03 00:45:53,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:53,716 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-03 00:45:53,753 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:45:53,756 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-03 00:45:53,756 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-03 00:45:53,756 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-03 00:45:53,756 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-03 00:45:53,756 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-03 00:45:53,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:45:53,897 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:45:53,941 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:45:53,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:45:53,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:45:53,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:45:53,995 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c78659790> has no local changes
2025-01-03 00:45:53,996 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:45:54,007 [ scc.git] DEBUG [detached HEAD 205718c] merge master -Dorg -Ssuccess-only
2025-01-03 00:45:54,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:45:54,007 [ scc.git] INFO Overriding base-branch from master to main
2025-01-03 00:45:54,008 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:45:54,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-03 00:45:54,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-03 00:45:55,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-03 00:45:55,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-03 00:45:56,293 [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-01-03 00:45:56,742 [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-01-03 00:45:57,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-03 00:45:57,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-03 00:45:58,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-03 00:45:58,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-03 00:45:59,185 [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-01-03 00:45:59,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-03 00:46:00,140 [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-01-03 00:46:00,140 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-03 00:46:00,141 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:46:00,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-03 00:46:00,141 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:00,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:00,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-03 00:46:00,153 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:46:00,153 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-03 00:46:00,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-03 00:46:00,166 [ scc.git] DEBUG Already up to date.
2025-01-03 00:46:00,166 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-03 00:46:00,566 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-03 00:46:00,567 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-03 00:46:00,573 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:46:00,573 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:00,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:00,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-03 00:46:00,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:00,592 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-03 00:46:00,631 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-03 00:46:00,632 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-03 00:46:00,632 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:46:00,632 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:46:00,639 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-03 00:46:00,646 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-03 00:46:00,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:00,788 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-03 00:46:00,794 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-03 00:46:00,800 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-03 00:46:00,806 [ scc.config] DEBUG Found github.token
2025-01-03 00:46:00,806 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-03 00:46:00,806 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:46:00,849 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:00,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:00,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:00,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:00,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c785f3580> has no local changes
2025-01-03 00:46:00,906 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:00,934 [ scc.git] DEBUG [detached HEAD 58dae3d] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:00,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:00,935 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:46:01,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-03 00:46:01,203 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:46:01,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-03 00:46:01,203 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,209 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:46:01,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:46:01,215 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:46:01,221 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:46:01,227 [ scc.git] DEBUG Already up to date.
2025-01-03 00:46:01,227 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:46:01,228 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,233 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:46:01,277 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:01,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:01,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c785f34f0> has no local changes
2025-01-03 00:46:01,335 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:01,344 [ scc.git] DEBUG [detached HEAD 31dca58] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:01,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:01,345 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:46:01,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-03 00:46:01,662 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:46:01,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-03 00:46:01,663 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:46:01,675 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:46:01,675 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:46:01,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:46:01,687 [ scc.git] DEBUG Already up to date.
2025-01-03 00:46:01,688 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:46:01,688 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,693 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:46:01,733 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:01,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:01,743 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:01,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:01,792 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c78604bb0> has no local changes
2025-01-03 00:46:01,792 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:01,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:01,801 [ scc.git] DEBUG [detached HEAD 36ff16d] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:01,801 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:46:02,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-03 00:46:02,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-03 00:46:03,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-03 00:46:03,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-03 00:46:04,027 [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-01-03 00:46:04,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-03 00:46:04,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:46:04,945 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-03 00:46:04,945 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:46:04,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-03 00:46:04,945 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:04,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:04,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-03 00:46:04,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:46:04,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-03 00:46:04,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-03 00:46:04,974 [ scc.git] DEBUG Already up to date.
2025-01-03 00:46:04,974 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-03 00:46:05,379 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-03 00:46:05,379 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-03 00:46:05,385 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:46:05,385 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:05,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:05,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-03 00:46:05,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:05,403 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-03 00:46:05,431 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-03 00:46:05,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-03 00:46:05,431 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:46:05,431 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:46:05,438 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-03 00:46:05,446 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-03 00:46:05,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:05,574 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-03 00:46:05,580 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-03 00:46:05,585 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-03 00:46:05,590 [ scc.config] DEBUG Found github.token
2025-01-03 00:46:05,591 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-03 00:46:05,591 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:46:05,634 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:05,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:05,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:05,684 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:05,692 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c785aba60> has no local changes
2025-01-03 00:46:05,692 [ 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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:05,702 [ scc.git] DEBUG [detached HEAD 135816c] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:05,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:05,703 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-03 00:46:05,703 [ scc.repo] DEBUG ## PRs found:
2025-01-03 00:46:06,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-03 00:46:06,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-03 00:46:07,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-03 00:46:07,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-03 00:46:07,897 [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-01-03 00:46:08,338 [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-01-03 00:46:08,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-03 00:46:09,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:46:09,260 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-03 00:46:09,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-03 00:46:10,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-03 00:46:10,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-03 00:46:10,993 [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-01-03 00:46:11,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-03 00:46:11,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-03 00:46:11,905 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-03 00:46:12,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-03 00:46:12,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-03 00:46:13,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-03 00:46:13,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-03 00:46:13,892 [ scc.repo] DEBUG ## Branches found:
2025-01-03 00:46:13,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-03 00:46:13,892 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:13,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:13,899 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-03 00:46:13,906 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-03 00:46:13,906 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-03 00:46:13,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-03 00:46:13,921 [ scc.git] DEBUG Already up to date.
2025-01-03 00:46:13,921 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-03 00:46:14,506 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-03 00:46:14,506 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-03 00:46:14,512 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-03 00:46:15,049 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-03 00:46:15,049 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-03 00:46:15,054 [ scc.git] DEBUG ## Unique users: []
2025-01-03 00:46:15,054 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:15,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:15,062 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-03 00:46:15,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:15,077 [ 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-01-03 00:46:15,107 [ 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-01-03 00:46:15,108 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-03 00:46:15,108 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-03 00:46:15,115 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-03 00:46:15,123 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-03 00:46:15,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:15,262 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-03 00:46:15,272 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-03 00:46:15,280 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#295](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-03 00:46:15,286 [ scc.config] DEBUG Found github.token
2025-01-03 00:46:15,286 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-03 00:46:15,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-03 00:46:15,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:15,301 [ 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-01-03 00:46:15,322 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-03 00:46:15,325 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-03 00:46:15,325 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-03 00:46:15,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:15,678 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-03 00:46:15,722 [ scc.git] DEBUG Get sha1 of %s
2025-01-03 00:46:15,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-03 00:46:15,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:15,781 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:15,789 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c785ab6a0> has no local changes
2025-01-03 00:46:15,789 [ 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)
Already up to date.
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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:15,857 [ scc.git] DEBUG [detached HEAD e86ae9b] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:15,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:15,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-03 00:46:15,944 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-03 00:46:16,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:16,089 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-03 00:46:16,094 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-03 00:46:16,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:16,485 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-03 00:46:16,490 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-03 00:46:16,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:16,870 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-03 00:46:16,875 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-03 00:46:17,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:17,270 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-03 00:46:17,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:17,651 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-03 00:46:17,656 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-03 00:46:18,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:18,037 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-03 00:46:18,043 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-03 00:46:18,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:18,436 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-03 00:46:18,443 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-03 00:46:18,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:18,835 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-03 00:46:18,842 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-03 00:46:19,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:19,232 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-03 00:46:19,239 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-03 00:46:19,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:19,611 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-03 00:46:19,618 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-03 00:46:19,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:20,000 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-03 00:46:20,006 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-03 00:46:20,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:20,391 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-03 00:46:20,399 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-03 00:46:20,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:20,817 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-03 00:46:21,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:21,207 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-03 00:46:21,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:21,599 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-03 00:46:21,604 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-03 00:46:21,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:21,995 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-03 00:46:22,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:22,389 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-03 00:46:22,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:22,776 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-03 00:46:22,782 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-03 00:46:23,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:23,168 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-03 00:46:23,174 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-03 00:46:23,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:23,588 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-03 00:46:23,594 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-03 00:46:23,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:23,970 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-03 00:46:23,976 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-03 00:46:24,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-03 00:46:24,361 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-03 00:46:24,361 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-03 00:46:24,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6c7aff7be0> has local changes
2025-01-03 00:46:24,452 [ 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`'
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 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'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
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'
Repository: ome/omero-iviewer
Excluded PRs:
- 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)
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'
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'
Repository: ome/omero-metadata
Already up to date.
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.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
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)
Already up to date.
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#295 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/295/)'
2025-01-03 00:46:24,519 [ scc.git] DEBUG [detached HEAD 8b3c42f] merge master -Dorg -Ssuccess-only
2025-01-03 00:46:24,519 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-03 00:46:24,520 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-03 00:46:24,520 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,520 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-03 00:46:24,520 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-03 00:46:24,520 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,520 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-03 00:46:24,520 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-03 00:46:24,520 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,520 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-03 00:46:24,520 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,520 [ scc.merge] INFO
2025-01-03 00:46:24,520 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-03 00:46:24,521 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-03 00:46:24,521 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-03 00:46:24,521 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-03 00:46:24,521 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-03 00:46:24,521 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,521 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-03 00:46:24,521 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,521 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-03 00:46:24,522 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-03 00:46:24,522 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-03 00:46:24,522 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,522 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-03 00:46:24,522 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-03 00:46:24,522 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-03 00:46:24,523 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-03 00:46:24,523 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-03 00:46:24,523 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-03 00:46:24,523 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-03 00:46:24,523 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-03 00:46:24,523 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-03 00:46:24,523 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,523 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-03 00:46:24,524 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-03 00:46:24,524 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-03 00:46:24,524 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-03 00:46:24,524 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,524 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-03 00:46:24,524 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO
2025-01-03 00:46:24,524 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-03 00:46:24,525 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,525 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-03 00:46:24,525 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,525 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-03 00:46:24,525 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-03 00:46:24,525 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,525 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-03 00:46:24,525 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-03 00:46:24,525 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-03 00:46:24,525 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,525 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,525 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-03 00:46:24,525 [ scc.merge] INFO
2025-01-03 00:46:24,526 [ scc.merge] INFO Repository: ome/scripts
2025-01-03 00:46:24,526 [ scc.merge] INFO Excluded PRs:
2025-01-03 00:46:24,526 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-03 00:46:24,526 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-03 00:46:24,526 [ scc.merge] INFO Already up to date.
2025-01-03 00:46:24,526 [ scc.merge] INFO
2025-01-03 00:46:24,526 [ scc.merge] INFO Merged PRs:
2025-01-03 00:46:24,526 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-03 00:46:24,526 [ scc.merge] INFO
2025-01-03 00:46:24,526 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-03 00:46:24,526 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-03 00:46:24,526 [ scc.merge] INFO
2025-01-03 00:46:24,526 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-03 00:46:24,526 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-03 00:46:24,533 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-03 00:46:24,540 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-03 00:46:24,546 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-03 00:46:24,551 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-03 00:46:24,557 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-03 00:46:24,563 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-03 00:46:24,569 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-03 00:46:24,576 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-03 00:46:24,582 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-03 00:46:24,588 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-03 00:46:24,593 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-03 00:46:24,598 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-03 00:46:24,603 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-03 00:46:24,608 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-03 00:46:24,615 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-03 00:46:24,620 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-03 00:46:24,625 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-03 00:46:24,630 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-03 00:46:24,636 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-03 00:46:24,642 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-03 00:46:24,648 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-03 00:46:24,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-03 00:46:24,655 [ scc.git] DEBUG Calling 'git remote'
2025-01-03 00:46:24,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/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
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: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: 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.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/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
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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: 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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: 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.1-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 ad8e253] 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 fb316a7e
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 b4102d4
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 f8494e5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-03 00:47:12,558 [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-01-03 00:47:21,553 [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-01-03 00:47:23,908 [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-01-03 00:47:28,307 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-03 00:48:07,621 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/695419c3/images/svgs/logo.svg){kind=logo}
