Skipping 114 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-28 00:45:18,672 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-28 00:45:18,672 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:45:18,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-28 00:45:18,672 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:18,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:18,678 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:45:18,683 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:45:18,683 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:45:18,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:45:18,697 [ scc.git] DEBUG Already up to date.
2025-01-28 00:45:18,697 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-28 00:45:19,094 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-28 00:45:19,095 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-28 00:45:19,099 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:45:19,099 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:19,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:19,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-28 00:45:19,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:19,115 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-28 00:45:19,188 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-28 00:45:19,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:45:19,191 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-28 00:45:19,191 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-28 00:45:19,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:19,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:45:19,376 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:19,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:19,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:45:19,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:45:19,432 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50504cb4f0> has no local changes
2025-01-28 00:45:19,432 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:45:19,497 [ scc.git] DEBUG [detached HEAD 2403e52] merge master -Dorg -Ssuccess-only
2025-01-28 00:45:19,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:45:19,498 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:45:19,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-28 00:45:20,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-28 00:45:20,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-28 00:45:21,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-28 00:45:21,215 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:21,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-28 00:45:22,324 [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-28 00:45:22,835 [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-28 00:45:23,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-28 00:45:23,821 [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-28 00:45:23,821 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-28 00:45:24,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-28 00:45:24,256 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:24,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-28 00:45:25,274 [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-28 00:45:25,740 [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-28 00:45:26,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-28 00:45:26,662 [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-28 00:45:26,663 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-28 00:45:27,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-28 00:45:27,109 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:27,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-28 00:45:28,142 [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-28 00:45:28,634 [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-28 00:45:29,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-28 00:45:29,495 [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-28 00:45:29,496 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-28 00:45:29,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-28 00:45:30,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-28 00:45:30,357 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:30,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-28 00:45:31,475 [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-28 00:45:31,966 [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-28 00:45:32,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-28 00:45:32,779 [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-28 00:45:32,780 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-28 00:45:33,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-28 00:45:33,248 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:33,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-28 00:45:34,264 [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-28 00:45:34,836 [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-28 00:45:35,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-28 00:45:35,784 [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-28 00:45:35,785 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-28 00:45:36,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-28 00:45:36,218 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:36,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-28 00:45:37,192 [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-28 00:45:37,708 [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-28 00:45:38,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-28 00:45:38,622 [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-28 00:45:38,623 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-28 00:45:38,623 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:45:38,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-28 00:45:38,624 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:38,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:38,630 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:45:38,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:45:38,636 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:45:38,642 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:45:38,648 [ scc.git] DEBUG Already up to date.
2025-01-28 00:45:38,648 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-28 00:45:38,967 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:38,967 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-28 00:45:38,971 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-28 00:45:39,275 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:39,276 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-28 00:45:39,280 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-28 00:45:39,565 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:39,566 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-28 00:45:39,570 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-28 00:45:39,847 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:39,847 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-28 00:45:39,852 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-28 00:45:40,135 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:40,135 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-28 00:45:40,139 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-28 00:45:40,427 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-28 00:45:40,427 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-28 00:45:40,432 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:45:40,432 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:40,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:40,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-28 00:45:40,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:40,515 [ 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-28 00:45:40,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:45:40,631 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-28 00:45:40,631 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-28 00:45:40,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:40,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-28 00:45:40,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:40,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-28 00:45:40,974 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-28 00:45:40,975 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:45:40,981 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-28 00:45:40,981 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-28 00:45:41,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:41,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-28 00:45:41,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:41,146 [ 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-28 00:45:41,295 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-28 00:45:41,295 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-28 00:45:41,295 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:45:41,296 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:45:41,302 [ scc.git] DEBUG Calling 'git reset --hard cae215a2dd3eb9caf4754675337fc058309c36af'
2025-01-28 00:45:41,310 [ scc.git] DEBUG HEAD is now at cae215a merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-28 00:45:41,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:41,532 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-28 00:45:41,539 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-28 00:45:41,544 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/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-28 00:45:41,548 [ scc.config] DEBUG Found github.token
2025-01-28 00:45:41,549 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-28 00:45:41,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-28 00:45:41,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:41,561 [ 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-28 00:45:41,700 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-28 00:45:41,701 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:45:41,706 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-28 00:45:41,706 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-28 00:45:41,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:41,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-28 00:45:41,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:41,992 [ 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-28 00:45:42,082 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-28 00:45:42,083 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:45:42,088 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-28 00:45:42,088 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-28 00:45:42,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:42,311 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-28 00:45:42,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:42,323 [ 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-28 00:45:42,456 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-28 00:45:42,457 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-28 00:45:42,457 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:45:42,458 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:45:42,466 [ scc.git] DEBUG Calling 'git reset --hard d9a33522206b1ccc7557664ac82176f1b6e09970'
2025-01-28 00:45:42,474 [ scc.git] DEBUG HEAD is now at d9a3352 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-28 00:45:42,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:45:42,699 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-28 00:45:42,705 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-28 00:45:42,710 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/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-28 00:45:42,714 [ scc.config] DEBUG Found github.token
2025-01-28 00:45:42,714 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-28 00:45:42,714 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:45:42,752 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:42,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:42,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:45:42,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:45:42,805 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f505049cb80> has no local changes
2025-01-28 00:45:42,806 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:45:42,816 [ scc.git] DEBUG [detached HEAD e061ab7] merge master -Dorg -Ssuccess-only
2025-01-28 00:45:42,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:45:42,816 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:45:43,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-28 00:45:43,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/501 HTTP/1.1" 200 None
2025-01-28 00:45:44,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/98b82e20e1e2c9ec3cddb2df14e0c59f93254df7 HTTP/1.1" 200 None
2025-01-28 00:45:44,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/98b82e20e1e2c9ec3cddb2df14e0c59f93254df7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-28 00:45:45,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/98b82e20e1e2c9ec3cddb2df14e0c59f93254df7/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-28 00:45:45,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/98b82e20e1e2c9ec3cddb2df14e0c59f93254df7 HTTP/1.1" 200 None
2025-01-28 00:45:45,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/98b82e20e1e2c9ec3cddb2df14e0c59f93254df7?per_page=1 HTTP/1.1" 200 2
2025-01-28 00:45:45,969 [ scc.repo] DEBUG - PR 501 will-moore 'Add docs/settings.md'
2025-01-28 00:45:46,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-28 00:45:46,421 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:45:46,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-28 00:45:47,426 [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-28 00:45:47,882 [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-28 00:45:48,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-28 00:45:48,739 [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-28 00:45:48,739 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-28 00:45:49,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-28 00:45:49,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-28 00:45:50,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-28 00:45:50,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-28 00:45:51,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-28 00:45:51,504 [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-28 00:45:51,950 [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-28 00:45:52,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-28 00:45:52,817 [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-28 00:45:52,817 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-28 00:45:53,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-28 00:45:53,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-28 00:45:54,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-28 00:45:54,743 [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-28 00:45:55,180 [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-28 00:45:55,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-28 00:45:56,108 [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-28 00:45:56,108 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-28 00:45:56,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-28 00:45:56,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-28 00:45:57,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-28 00:45:57,911 [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-28 00:45:58,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-28 00:45:58,729 [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-28 00:45:58,730 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-28 00:45:58,731 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:45:58,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-28 00:45:58,731 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:45:58,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:45:58,737 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:45:58,742 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:45:58,742 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:45:58,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:45:58,764 [ scc.git] DEBUG Updating b4102d4..89ee6e8
2025-01-28 00:45:59,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/500 HTTP/1.1" 200 None
2025-01-28 00:45:59,272 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-28 00:45:59,717 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-28 00:45:59,718 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-28 00:45:59,722 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-28 00:46:01,430 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-28 00:46:01,431 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-28 00:46:01,435 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-28 00:46:01,871 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-28 00:46:01,871 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-28 00:46:01,877 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-28 00:46:02,167 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-28 00:46:02,167 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-28 00:46:02,172 [ scc.git] DEBUG Calling 'git fetch origin pull/501/head'
2025-01-28 00:46:02,749 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-28 00:46:02,750 [ scc.git] DEBUG * branch refs/pull/501/head -> FETCH_HEAD
2025-01-28 00:46:02,752 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:02,752 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:02,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:02,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-28 00:46:02,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:02,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-28 00:46:02,960 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-28 00:46:02,960 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-28 00:46:03,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:03,032 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-28 00:46:03,032 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-28 00:46:03,032 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-28 00:46:03,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:03,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-28 00:46:03,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:03,184 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-28 00:46:03,422 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-28 00:46:03,422 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-28 00:46:03,422 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-28 00:46:03,422 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-28 00:46:03,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:03,427 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-28 00:46:03,427 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-28 00:46:03,427 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-28 00:46:03,427 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-28 00:46:03,427 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-28 00:46:03,427 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-28 00:46:03,427 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-28 00:46:03,427 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-28 00:46:03,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:03,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-28 00:46:03,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:03,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-28 00:46:03,727 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-28 00:46:03,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:03,732 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-28 00:46:03,732 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-28 00:46:03,732 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-28 00:46:03,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:03,959 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-28 00:46:03,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:03,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-28 00:46:04,040 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:04,051 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-28 00:46:04,051 [ scc.git] DEBUG package.json | 2 +-
2025-01-28 00:46:04,051 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-28 00:46:04,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:04,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...98b82e20e1e2c9ec3cddb2df14e0c59f93254df7'
2025-01-28 00:46:04,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:04,350 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 501 (Add docs/settings.md) 98b82e20e1e2c9ec3cddb2df14e0c59f93254df7'
2025-01-28 00:46:04,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:04,371 [ scc.git] DEBUG README.rst | 36 ++--------------------------
2025-01-28 00:46:04,371 [ scc.git] DEBUG docs/settings.md | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2025-01-28 00:46:04,371 [ scc.git] DEBUG 2 files changed, 74 insertions(+), 34 deletions(-)
2025-01-28 00:46:04,371 [ scc.git] DEBUG create mode 100644 docs/settings.md
2025-01-28 00:46:04,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:04,728 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:04,768 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:04,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:04,774 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:04,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:04,828 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050485e80> has no local changes
2025-01-28 00:46:04,828 [ 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)
Updating b4102d4..89ee6e8
Previously merged:
- PR 500 will-moore 'Support max_active_channels'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 501 will-moore 'Add docs/settings.md'
Generated by OMERO-plugins-push#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:04,839 [ scc.git] DEBUG [detached HEAD ca8f7da] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:04,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:04,840 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:05,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-28 00:46:05,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-28 00:46:06,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-28 00:46:06,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-28 00:46:07,172 [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-28 00:46:07,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-28 00:46:08,079 [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-28 00:46:08,079 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-28 00:46:08,080 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:08,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-28 00:46:08,080 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:08,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:08,085 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:08,090 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:08,090 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:08,096 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:08,101 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:08,101 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-28 00:46:09,161 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-28 00:46:09,161 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-28 00:46:09,167 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:09,167 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:09,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:09,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-28 00:46:09,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:09,184 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-28 00:46:09,194 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:09,197 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-28 00:46:09,197 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-28 00:46:09,197 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-28 00:46:09,197 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-28 00:46:09,197 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-28 00:46:09,197 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-28 00:46:09,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:09,329 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:09,371 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:09,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:09,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:09,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:09,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f505043c5b0> has no local changes
2025-01-28 00:46:09,425 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:09,511 [ scc.git] DEBUG [detached HEAD dd36e03] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:09,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:09,512 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:09,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-28 00:46:10,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-28 00:46:10,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-28 00:46:11,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-28 00:46:11,732 [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-28 00:46:12,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-28 00:46:12,560 [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-28 00:46:12,560 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-28 00:46:13,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-28 00:46:13,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-28 00:46:14,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-28 00:46:14,436 [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-28 00:46:14,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-28 00:46:15,301 [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-28 00:46:15,301 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-28 00:46:15,302 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:15,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-28 00:46:15,302 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:15,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:15,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:15,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:15,313 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:15,318 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:15,324 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:15,324 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-28 00:46:16,173 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-28 00:46:16,173 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-28 00:46:16,178 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-28 00:46:16,718 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-28 00:46:16,719 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-28 00:46:16,724 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:16,724 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:16,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:16,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-28 00:46:16,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:16,741 [ 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-28 00:46:17,040 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-28 00:46:17,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-28 00:46:17,040 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-28 00:46:17,041 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-28 00:46:17,041 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:46:17,042 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:46:17,048 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-28 00:46:17,055 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-28 00:46:17,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:17,220 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-28 00:46:17,228 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-28 00:46:17,292 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-28 00:46:17,298 [ scc.config] DEBUG Found github.token
2025-01-28 00:46:17,298 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-28 00:46:17,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-28 00:46:17,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:17,313 [ 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-28 00:46:17,388 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-28 00:46:17,388 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-28 00:46:17,388 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-28 00:46:17,388 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:46:17,389 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:46:17,396 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-28 00:46:17,404 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-28 00:46:17,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:17,620 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-28 00:46:17,627 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-28 00:46:17,633 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/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-28 00:46:17,638 [ scc.config] DEBUG Found github.token
2025-01-28 00:46:17,638 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-28 00:46:17,638 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:17,679 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:17,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:17,684 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:17,727 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:17,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050450b80> has no local changes
2025-01-28 00:46:17,735 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:17,746 [ scc.git] DEBUG [detached HEAD ab65bbd] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:17,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:17,746 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:18,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-28 00:46:18,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-01-28 00:46:18,667 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-28 00:46:19,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-28 00:46:19,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-28 00:46:20,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-28 00:46:20,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-28 00:46:21,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-01-28 00:46:21,098 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-28 00:46:21,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-28 00:46:22,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-28 00:46:22,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-28 00:46:22,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-28 00:46:23,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-28 00:46:23,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-28 00:46:24,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-28 00:46:24,324 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:24,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-28 00:46:24,324 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:24,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:24,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:24,336 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:24,336 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:24,342 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:24,348 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:24,348 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-01-28 00:46:24,668 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-01-28 00:46:24,669 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-01-28 00:46:24,673 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:24,673 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:24,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:24,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-28 00:46:24,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:24,690 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-28 00:46:24,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:24,764 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-01-28 00:46:24,764 [ scc.git] DEBUG package.json | 2 +-
2025-01-28 00:46:24,765 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-01-28 00:46:24,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:24,904 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:24,946 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:24,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:24,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:24,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:24,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050477f40> has no local changes
2025-01-28 00:46:24,999 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:25,008 [ scc.git] DEBUG [detached HEAD 2f3f9bd] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:25,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:25,009 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:25,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-28 00:46:25,311 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:25,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-28 00:46:25,311 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,317 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:25,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:25,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:25,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:25,332 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:25,332 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:25,332 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,337 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:25,376 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:25,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:25,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50503f2940> has no local changes
2025-01-28 00:46:25,429 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:25,437 [ scc.git] DEBUG [detached HEAD 7b1e78b] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:25,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:25,438 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:25,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-28 00:46:25,725 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:25,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-28 00:46:25,725 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,733 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:25,741 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:25,741 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:25,749 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:25,757 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:25,757 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:25,757 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,761 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:25,799 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:25,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:25,805 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:25,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:25,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50503ac5e0> has no local changes
2025-01-28 00:46:25,849 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:25,857 [ scc.git] DEBUG [detached HEAD 70701df] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:25,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:25,857 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:26,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-28 00:46:26,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-28 00:46:27,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-28 00:46:27,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-28 00:46:28,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-28 00:46:28,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-28 00:46:29,095 [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-28 00:46:29,096 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-28 00:46:29,096 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:29,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-28 00:46:29,096 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:29,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:29,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:29,107 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:29,107 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:29,112 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:29,117 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:29,117 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-28 00:46:29,656 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-28 00:46:29,656 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-28 00:46:29,662 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:29,662 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:29,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:29,667 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-28 00:46:29,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:29,678 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-28 00:46:29,862 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG Auto-merging setup.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-28 00:46:29,863 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:46:29,863 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:46:29,869 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-28 00:46:29,875 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-28 00:46:30,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:30,002 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-28 00:46:30,010 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-28 00:46:30,118 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-01-28 00:46:30,124 [ scc.config] DEBUG Found github.token
2025-01-28 00:46:30,124 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-28 00:46:30,124 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:30,166 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:30,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:30,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:30,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:30,217 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50503ac7f0> has no local changes
2025-01-28 00:46:30,218 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:30,225 [ scc.git] DEBUG [detached HEAD 654f68b] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:30,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:30,226 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:30,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-28 00:46:30,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-28 00:46:31,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-28 00:46:31,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-28 00:46:32,426 [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-28 00:46:32,880 [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-28 00:46:33,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-28 00:46:33,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-28 00:46:34,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-28 00:46:34,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-28 00:46:35,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-28 00:46:35,589 [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-28 00:46:36,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-28 00:46:36,515 [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-28 00:46:36,515 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-28 00:46:36,516 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:36,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-28 00:46:36,516 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:36,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:36,522 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:36,528 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:36,528 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:36,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:36,540 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:36,540 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-28 00:46:36,998 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-28 00:46:36,998 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-28 00:46:37,003 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:37,004 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:37,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-28 00:46:37,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,022 [ 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-28 00:46:37,048 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-28 00:46:37,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-28 00:46:37,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-28 00:46:37,053 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-28 00:46:37,054 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-28 00:46:37,054 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-28 00:46:37,054 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-28 00:46:37,055 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-28 00:46:37,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:37,190 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:37,234 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:37,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,240 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:37,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:37,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50503ac640> has no local changes
2025-01-28 00:46:37,289 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:37,300 [ scc.git] DEBUG [detached HEAD bc7acc5] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:37,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:37,300 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:37,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-28 00:46:37,626 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:37,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-28 00:46:37,626 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:37,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,633 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:37,639 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:37,639 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:37,645 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:37,651 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:37,651 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:37,651 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:37,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,656 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:37,699 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:37,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:37,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:37,748 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:37,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050413550> has no local changes
2025-01-28 00:46:37,755 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:37,764 [ scc.git] DEBUG [detached HEAD d94eee3] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:37,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:37,764 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:38,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-28 00:46:38,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-28 00:46:39,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-28 00:46:39,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-28 00:46:39,971 [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-28 00:46:40,401 [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-28 00:46:40,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-28 00:46:41,311 [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-28 00:46:41,311 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-28 00:46:41,312 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:41,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-28 00:46:41,312 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:41,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:41,318 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:41,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:41,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:41,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:41,332 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:41,333 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-28 00:46:41,953 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-28 00:46:41,953 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-28 00:46:41,958 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:41,958 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:41,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:41,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-28 00:46:41,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:41,974 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-28 00:46:42,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:46:42,055 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-28 00:46:42,055 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-28 00:46:42,055 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-28 00:46:42,055 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-28 00:46:42,055 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-28 00:46:42,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:42,189 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:42,230 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:42,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:42,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:42,275 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:42,281 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050413790> has no local changes
2025-01-28 00:46:42,281 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:42,289 [ scc.git] DEBUG [detached HEAD 8e604ef] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:42,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:42,290 [ scc.git] INFO Overriding base-branch from master to main
2025-01-28 00:46:42,290 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:42,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-28 00:46:43,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-28 00:46:43,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-28 00:46:44,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-28 00:46:44,558 [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-28 00:46:45,040 [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-28 00:46:45,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-28 00:46:45,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-28 00:46:46,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-28 00:46:46,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-28 00:46:47,338 [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-28 00:46:47,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-28 00:46:48,163 [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-28 00:46:48,164 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-28 00:46:48,164 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:48,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-28 00:46:48,164 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:48,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:48,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-28 00:46:48,175 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:48,175 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-28 00:46:48,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-28 00:46:48,188 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:48,188 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-28 00:46:48,704 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-28 00:46:48,704 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-28 00:46:48,709 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:48,709 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:48,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:48,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-28 00:46:48,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:48,726 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-28 00:46:48,917 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-28 00:46:48,917 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-28 00:46:48,917 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:46:48,917 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:46:48,923 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-28 00:46:48,929 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-28 00:46:49,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:49,056 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-28 00:46:49,062 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-28 00:46:49,068 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-28 00:46:49,073 [ scc.config] DEBUG Found github.token
2025-01-28 00:46:49,073 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-28 00:46:49,073 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:49,115 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,120 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:49,161 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:49,167 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050384580> has no local changes
2025-01-28 00:46:49,168 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:49,176 [ scc.git] DEBUG [detached HEAD b4258a2] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:49,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:49,176 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:49,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-28 00:46:49,460 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:49,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-28 00:46:49,460 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,466 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:49,472 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:49,472 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:49,478 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:49,484 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:49,485 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:49,485 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,490 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:49,533 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:49,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:49,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f50503844f0> has no local changes
2025-01-28 00:46:49,587 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:49,596 [ scc.git] DEBUG [detached HEAD a8a5054] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:49,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:49,596 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:49,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-28 00:46:49,874 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:49,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-28 00:46:49,874 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:49,886 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:49,886 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:49,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:49,897 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:49,897 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:49,897 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,902 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:49,946 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:49,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:49,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:49,993 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:50,000 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5050395bb0> has no local changes
2025-01-28 00:46:50,001 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:50,010 [ scc.git] DEBUG [detached HEAD 54d74fe] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:50,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:50,010 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:50,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-28 00:46:50,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-28 00:46:51,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-28 00:46:51,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-28 00:46:52,207 [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-28 00:46:52,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-28 00:46:53,082 [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-28 00:46:53,082 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-28 00:46:53,082 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:46:53,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-28 00:46:53,083 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:53,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:53,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-28 00:46:53,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:46:53,093 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-28 00:46:53,098 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-28 00:46:53,104 [ scc.git] DEBUG Already up to date.
2025-01-28 00:46:53,104 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-28 00:46:53,534 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-28 00:46:53,534 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-28 00:46:53,540 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:46:53,540 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:53,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:53,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-28 00:46:53,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:53,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-28 00:46:53,645 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-28 00:46:53,645 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-28 00:46:53,645 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:46:53,646 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:46:53,652 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-28 00:46:53,659 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-28 00:46:53,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:46:53,791 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-28 00:46:53,797 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-28 00:46:53,802 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-28 00:46:53,807 [ scc.config] DEBUG Found github.token
2025-01-28 00:46:53,807 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-28 00:46:53,807 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:46:53,845 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:46:53,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:46:53,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:46:53,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:46:53,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f505033ba30> has no local changes
2025-01-28 00:46:53,895 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:46:53,903 [ scc.git] DEBUG [detached HEAD 7858dcb] merge master -Dorg -Ssuccess-only
2025-01-28 00:46:53,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:46:53,903 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-28 00:46:53,904 [ scc.repo] DEBUG ## PRs found:
2025-01-28 00:46:54,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-28 00:46:54,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-28 00:46:55,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-28 00:46:55,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-28 00:46:56,110 [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-28 00:46:56,541 [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-28 00:46:57,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-28 00:46:57,441 [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-28 00:46:57,442 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-28 00:46:57,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-28 00:46:58,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-28 00:46:58,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-28 00:46:59,223 [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-28 00:46:59,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-28 00:47:00,079 [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-28 00:47:00,079 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-28 00:47:00,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-28 00:47:01,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-28 00:47:01,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-28 00:47:01,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-28 00:47:01,912 [ scc.repo] DEBUG ## Branches found:
2025-01-28 00:47:01,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-28 00:47:01,913 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:47:01,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:47:01,919 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-28 00:47:01,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-28 00:47:01,924 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-28 00:47:01,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-28 00:47:01,934 [ scc.git] DEBUG Already up to date.
2025-01-28 00:47:01,934 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-28 00:47:02,712 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-28 00:47:02,712 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-28 00:47:02,716 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-28 00:47:03,255 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-28 00:47:03,255 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-28 00:47:03,260 [ scc.git] DEBUG ## Unique users: []
2025-01-28 00:47:03,260 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:47:03,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:47:03,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-28 00:47:03,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:47:03,279 [ 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-28 00:47:03,311 [ 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-28 00:47:03,311 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-28 00:47:03,312 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-28 00:47:03,317 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-28 00:47:03,324 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-28 00:47:03,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:03,459 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-28 00:47:03,468 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-28 00:47:03,475 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#318](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-28 00:47:03,481 [ scc.config] DEBUG Found github.token
2025-01-28 00:47:03,481 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-28 00:47:03,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-28 00:47:03,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:47:03,493 [ 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-28 00:47:03,521 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-28 00:47:03,524 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-28 00:47:03,524 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-28 00:47:03,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:03,843 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-28 00:47:03,886 [ scc.git] DEBUG Get sha1 of %s
2025-01-28 00:47:03,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-28 00:47:03,891 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:47:03,933 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:47:03,940 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f505033b670> has no local changes
2025-01-28 00:47:03,940 [ 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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:47:03,949 [ scc.git] DEBUG [detached HEAD be894ca] merge master -Dorg -Ssuccess-only
2025-01-28 00:47:03,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:03,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-28 00:47:04,031 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-28 00:47:04,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:04,241 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-28 00:47:04,246 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-28 00:47:04,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:04,620 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-28 00:47:04,625 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-28 00:47:04,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:05,005 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-28 00:47:05,009 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-28 00:47:05,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:05,407 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-28 00:47:05,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:05,785 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-28 00:47:05,789 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-28 00:47:06,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:06,172 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-28 00:47:06,177 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-28 00:47:06,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:06,551 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-28 00:47:06,556 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-28 00:47:06,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:06,934 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-28 00:47:06,939 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-28 00:47:07,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:07,330 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-28 00:47:07,334 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-28 00:47:07,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:07,711 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-28 00:47:07,716 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-28 00:47:08,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:08,107 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-28 00:47:08,112 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-28 00:47:08,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:08,483 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-28 00:47:08,487 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-28 00:47:08,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:08,878 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-28 00:47:09,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:09,266 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-28 00:47:09,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:09,647 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-28 00:47:09,652 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-28 00:47:10,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:10,041 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-28 00:47:10,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:10,427 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-28 00:47:10,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:10,801 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-28 00:47:10,807 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-28 00:47:11,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:11,181 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-28 00:47:11,187 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-28 00:47:11,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:11,564 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-28 00:47:11,569 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-28 00:47:11,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:11,952 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-28 00:47:11,957 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-28 00:47:12,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-28 00:47:12,329 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-28 00:47:12,329 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-28 00:47:12,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5051586370> has local changes
2025-01-28 00:47:12,417 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
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 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
- PR 610 will-moore 'Add docs/contributing.rst'
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)
Updating b4102d4..89ee6e8
Previously merged:
- PR 500 will-moore 'Support max_active_channels'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 501 will-moore 'Add docs/settings.md'
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.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
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#318 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/318/)'
2025-01-28 00:47:12,432 [ scc.git] DEBUG [detached HEAD 89fc7c2] merge master -Dorg -Ssuccess-only
2025-01-28 00:47:12,433 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-28 00:47:12,433 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-28 00:47:12,433 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,433 [ scc.merge] INFO
2025-01-28 00:47:12,433 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,433 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-28 00:47:12,433 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-28 00:47:12,433 [ scc.merge] INFO
2025-01-28 00:47:12,433 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-28 00:47:12,433 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,433 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-28 00:47:12,434 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-28 00:47:12,434 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-28 00:47:12,434 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-28 00:47:12,434 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-28 00:47:12,434 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-28 00:47:12,434 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-28 00:47:12,434 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-28 00:47:12,434 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,434 [ scc.merge] INFO
2025-01-28 00:47:12,434 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
2025-01-28 00:47:12,434 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-28 00:47:12,435 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-28 00:47:12,435 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-28 00:47:12,435 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-28 00:47:12,435 [ scc.merge] INFO Updating b4102d4..89ee6e8
2025-01-28 00:47:12,435 [ scc.merge] INFO Previously merged:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 501 will-moore 'Add docs/settings.md'
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,435 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-28 00:47:12,435 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,435 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-28 00:47:12,435 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,435 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-28 00:47:12,436 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-28 00:47:12,436 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-28 00:47:12,436 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-28 00:47:12,436 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-28 00:47:12,436 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-28 00:47:12,436 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-28 00:47:12,436 [ scc.merge] INFO
2025-01-28 00:47:12,436 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-28 00:47:12,436 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-28 00:47:12,436 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,437 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,437 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-28 00:47:12,437 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,437 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-28 00:47:12,437 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,437 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-28 00:47:12,437 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,437 [ scc.merge] INFO
2025-01-28 00:47:12,437 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,438 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-28 00:47:12,438 [ scc.merge] INFO
2025-01-28 00:47:12,438 [ scc.merge] INFO Repository: ome/scripts
2025-01-28 00:47:12,438 [ scc.merge] INFO Excluded PRs:
2025-01-28 00:47:12,438 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-28 00:47:12,438 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-28 00:47:12,438 [ scc.merge] INFO Already up to date.
2025-01-28 00:47:12,438 [ scc.merge] INFO
2025-01-28 00:47:12,438 [ scc.merge] INFO Merged PRs:
2025-01-28 00:47:12,438 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-28 00:47:12,438 [ scc.merge] INFO
2025-01-28 00:47:12,438 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-28 00:47:12,438 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-28 00:47:12,438 [ scc.merge] INFO
2025-01-28 00:47:12,438 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-28 00:47:12,438 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-28 00:47:12,444 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-28 00:47:12,450 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-28 00:47:12,455 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-28 00:47:12,460 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-28 00:47:12,465 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-28 00:47:12,469 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-28 00:47:12,474 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-28 00:47:12,479 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-28 00:47:12,485 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-28 00:47:12,490 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-28 00:47:12,496 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-28 00:47:12,501 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-28 00:47:12,506 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-28 00:47:12,511 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-28 00:47:12,516 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-28 00:47:12,522 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-28 00:47:12,528 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-28 00:47:12,533 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-28 00:47:12,539 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-28 00:47:12,544 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-28 00:47:12,550 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-28 00:47:12,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-28 00:47:12,555 [ scc.git] DEBUG Calling 'git remote'
2025-01-28 00:47:12,560 [ 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 f334ea2] 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 a80640a9
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 d4bdcc4] 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-28 00:47:59,661 [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-28 00:48:08,381 [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-28 00:48:10,687 [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-28 00:48:15,258 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-28 00:48:55,307 [ 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/eb00aee0/images/svgs/logo.svg){kind=logo}
