Skipping 109 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-14 10:28:20,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-14 10:28:20,644 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-14 10:28:20,644 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:28:20,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-14 10:28:20,644 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:20,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:20,650 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:28:20,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:28:20,656 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:28:20,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:28:20,668 [ scc.git] DEBUG Already up to date.
2025-01-14 10:28:20,668 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-14 10:28:21,018 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-14 10:28:21,018 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-14 10:28:21,024 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:28:21,024 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:21,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:21,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-14 10:28:21,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:21,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-14 10:28:21,094 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-14 10:28:21,094 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:28:21,097 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-14 10:28:21,097 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-14 10:28:21,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:21,234 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:28:21,275 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:21,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:21,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:28:21,321 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:28:21,327 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5605c729a0> has no local changes
2025-01-14 10:28:21,328 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:28:21,336 [ scc.git] DEBUG [detached HEAD d977130] merge master -Dorg -Ssuccess-only
2025-01-14 10:28:21,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:28:21,337 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:28:21,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-14 10:28:22,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-14 10:28:22,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-14 10:28:23,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-14 10:28:23,262 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:23,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-14 10:28:24,341 [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-14 10:28:24,843 [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-14 10:28:25,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-14 10:28:25,707 [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-14 10:28:25,708 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-14 10:28:26,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-14 10:28:26,171 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:26,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-14 10:28:27,210 [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-14 10:28:27,729 [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-14 10:28:28,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-14 10:28:28,665 [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-14 10:28:28,666 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-14 10:28:29,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-14 10:28:29,121 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:29,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-14 10:28:30,410 [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-14 10:28:30,912 [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-14 10:28:31,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-14 10:28:31,814 [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-14 10:28:31,814 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-14 10:28:32,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-14 10:28:32,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-14 10:28:32,697 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:33,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-14 10:28:33,806 [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-14 10:28:34,327 [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-14 10:28:34,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-14 10:28:35,303 [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-14 10:28:35,304 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-14 10:28:35,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-14 10:28:35,808 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:36,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-14 10:28:36,827 [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-14 10:28:37,438 [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-14 10:28:37,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-14 10:28:38,364 [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-14 10:28:38,365 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-14 10:28:38,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-14 10:28:38,829 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:39,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-14 10:28:39,922 [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-14 10:28:40,419 [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-14 10:28:40,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-14 10:28:41,421 [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-14 10:28:41,422 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-14 10:28:41,422 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:28:41,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-14 10:28:41,422 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:41,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:41,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:28:41,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:28:41,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:28:41,443 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:28:41,449 [ scc.git] DEBUG Already up to date.
2025-01-14 10:28:41,449 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-14 10:28:41,746 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:41,747 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-14 10:28:41,752 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-14 10:28:42,050 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:42,051 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-14 10:28:42,055 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-14 10:28:42,424 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:42,424 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-14 10:28:42,429 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-14 10:28:42,712 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:42,713 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-14 10:28:42,718 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-14 10:28:43,005 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:43,006 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-14 10:28:43,012 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-14 10:28:43,357 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-14 10:28:43,358 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-14 10:28:43,365 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:28:43,365 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:43,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:43,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-14 10:28:43,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:43,432 [ 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-14 10:28:43,495 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:28:43,500 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-14 10:28:43,500 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-14 10:28:43,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:43,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-14 10:28:43,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:43,659 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-14 10:28:43,790 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-14 10:28:43,791 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:28:43,796 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-14 10:28:43,796 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-14 10:28:44,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:44,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-14 10:28:44,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:44,056 [ 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-14 10:28:44,152 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-14 10:28:44,153 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-14 10:28:44,153 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:28:44,153 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:28:44,159 [ scc.git] DEBUG Calling 'git reset --hard 4bfa39a24c3afbedb0b7b1d6b3dc11c0eb36e5f5'
2025-01-14 10:28:44,166 [ scc.git] DEBUG HEAD is now at 4bfa39a merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-14 10:28:44,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:44,416 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-14 10:28:44,424 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-14 10:28:44,430 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/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-14 10:28:44,435 [ scc.config] DEBUG Found github.token
2025-01-14 10:28:44,435 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-14 10:28:44,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-14 10:28:44,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:44,511 [ 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-14 10:28:44,715 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-14 10:28:44,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:28:44,721 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-14 10:28:44,721 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-14 10:28:44,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:44,870 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-14 10:28:44,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:44,930 [ 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-14 10:28:44,966 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-14 10:28:44,967 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:28:44,972 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-14 10:28:44,972 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-14 10:28:45,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:45,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-14 10:28:45,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:45,266 [ 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-14 10:28:45,387 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-14 10:28:45,387 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-14 10:28:45,387 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:28:45,388 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:28:45,394 [ scc.git] DEBUG Calling 'git reset --hard 15825af40003f9a34790768ae2a4d2cdbab4d731'
2025-01-14 10:28:45,401 [ scc.git] DEBUG HEAD is now at 15825af merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-14 10:28:45,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:28:45,636 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-14 10:28:45,643 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-14 10:28:45,649 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/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-14 10:28:45,654 [ scc.config] DEBUG Found github.token
2025-01-14 10:28:45,655 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-14 10:28:45,655 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:28:45,701 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:28:45,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:28:45,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:28:45,752 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:28:45,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5605c66b20> has no local changes
2025-01-14 10:28:45,761 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:28:45,772 [ scc.git] DEBUG [detached HEAD 80550d9] merge master -Dorg -Ssuccess-only
2025-01-14 10:28:45,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:28:45,773 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:28:46,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-14 10:28:46,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-14 10:28:47,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-14 10:28:47,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-14 10:28:48,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-14 10:28:48,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-14 10:28:49,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82?per_page=1 HTTP/1.1" 200 2
2025-01-14 10:28:49,050 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-14 10:28:49,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-14 10:28:49,522 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-14 10:28:50,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-14 10:28:50,672 [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-14 10:28:51,153 [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-14 10:28:51,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-14 10:28:52,133 [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-14 10:28:52,135 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-14 10:28:52,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-14 10:28:53,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-14 10:28:53,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-14 10:28:54,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-14 10:28:54,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-14 10:28:55,060 [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-14 10:28:55,549 [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-14 10:28:56,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-14 10:28:56,469 [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-14 10:28:56,470 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-14 10:28:56,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-14 10:28:57,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-14 10:28:57,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-14 10:28:58,451 [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-14 10:28:58,915 [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-14 10:28:59,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-14 10:28:59,815 [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-14 10:28:59,815 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-14 10:29:00,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-14 10:29:00,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-14 10:29:01,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-14 10:29:01,789 [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-14 10:29:02,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-14 10:29:02,705 [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-14 10:29:02,706 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-14 10:29:02,707 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:02,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-14 10:29:02,707 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:02,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:02,713 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:02,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:02,718 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:02,723 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:02,729 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:02,729 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-14 10:29:03,983 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-14 10:29:03,983 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-14 10:29:03,989 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-14 10:29:04,686 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-14 10:29:04,686 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-14 10:29:04,691 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-14 10:29:05,053 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-14 10:29:05,053 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-14 10:29:05,058 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-14 10:29:05,342 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-14 10:29:05,342 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-14 10:29:05,347 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-14 10:29:06,417 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-14 10:29:06,417 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-14 10:29:06,423 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:06,423 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:06,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:06,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-14 10:29:06,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:06,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-14 10:29:06,474 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-14 10:29:06,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:06,478 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-14 10:29:06,479 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-14 10:29:06,479 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-14 10:29:06,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:06,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-14 10:29:06,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:06,625 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-14 10:29:06,932 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-14 10:29:06,932 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-14 10:29:06,932 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-14 10:29:06,932 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-14 10:29:06,932 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:06,937 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-14 10:29:06,937 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-14 10:29:06,937 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-14 10:29:06,937 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-14 10:29:06,937 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-14 10:29:06,937 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-14 10:29:06,938 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-14 10:29:06,940 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-14 10:29:07,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:07,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-14 10:29:07,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:07,096 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-14 10:29:07,154 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-14 10:29:07,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:07,158 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-14 10:29:07,158 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-14 10:29:07,158 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-14 10:29:07,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:07,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-14 10:29:07,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:07,489 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-14 10:29:07,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:07,609 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-14 10:29:07,609 [ scc.git] DEBUG package.json | 2 +-
2025-01-14 10:29:07,609 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-14 10:29:07,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:07,860 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-14 10:29:07,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:07,875 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-14 10:29:08,332 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-14 10:29:08,333 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-14 10:29:08,333 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-14 10:29:08,333 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-14 10:29:08,333 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-14 10:29:08,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:08,338 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-14 10:29:08,338 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-14 10:29:08,338 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-14 10:29:08,338 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-14 10:29:08,338 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-14 10:29:08,338 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-14 10:29:08,338 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-14 10:29:08,338 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-14 10:29:08,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:08,471 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:08,511 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:08,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:08,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:08,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:08,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5605c2ee50> has no local changes
2025-01-14 10:29:08,564 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:08,575 [ scc.git] DEBUG [detached HEAD 58c5702] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:08,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:08,576 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:09,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-14 10:29:09,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-14 10:29:09,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-14 10:29:10,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-14 10:29:10,979 [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-14 10:29:11,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-14 10:29:11,923 [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-14 10:29:11,924 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-14 10:29:11,924 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:11,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-14 10:29:11,925 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:11,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:11,930 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:11,935 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:11,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:11,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:11,946 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:11,946 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-14 10:29:12,692 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-14 10:29:12,693 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-14 10:29:12,698 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:12,698 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:12,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:12,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-14 10:29:12,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:12,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-14 10:29:12,726 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:12,728 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-14 10:29:12,728 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-14 10:29:12,728 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-14 10:29:12,728 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-14 10:29:12,728 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-14 10:29:12,729 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-14 10:29:12,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:12,878 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:12,919 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:12,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:12,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:12,965 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:12,972 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043f95b0> has no local changes
2025-01-14 10:29:12,972 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:12,982 [ scc.git] DEBUG [detached HEAD d450eca] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:12,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:12,982 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:13,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-14 10:29:13,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-14 10:29:14,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-14 10:29:14,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-14 10:29:15,413 [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-14 10:29:15,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-14 10:29:16,239 [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-14 10:29:16,239 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-14 10:29:16,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-14 10:29:17,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-14 10:29:17,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-14 10:29:18,163 [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-14 10:29:18,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-14 10:29:19,085 [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-14 10:29:19,086 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-14 10:29:19,086 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:19,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-14 10:29:19,086 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:19,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:19,093 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:19,098 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:19,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:19,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:19,110 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:19,110 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-14 10:29:20,081 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-14 10:29:20,082 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-14 10:29:20,087 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-14 10:29:20,732 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-14 10:29:20,732 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-14 10:29:20,737 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:20,737 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:20,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:20,743 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-14 10:29:20,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:20,754 [ 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-14 10:29:20,808 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-14 10:29:20,808 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-14 10:29:20,808 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-14 10:29:20,808 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-14 10:29:20,808 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:29:20,809 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:29:20,815 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-14 10:29:20,822 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-14 10:29:20,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:20,961 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-14 10:29:20,969 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-14 10:29:21,022 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-14 10:29:21,028 [ scc.config] DEBUG Found github.token
2025-01-14 10:29:21,028 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-14 10:29:21,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-14 10:29:21,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:21,041 [ 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-14 10:29:21,101 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-14 10:29:21,101 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-14 10:29:21,101 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-14 10:29:21,101 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:29:21,102 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:29:21,108 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-14 10:29:21,115 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-14 10:29:21,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:21,484 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-14 10:29:21,491 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-14 10:29:21,497 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/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-14 10:29:21,502 [ scc.config] DEBUG Found github.token
2025-01-14 10:29:21,502 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-14 10:29:21,502 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:21,541 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:21,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:21,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:21,584 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:21,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f560440db80> has no local changes
2025-01-14 10:29:21,592 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:21,601 [ scc.git] DEBUG [detached HEAD 2041849] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:21,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:21,602 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:22,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-14 10:29:22,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-14 10:29:23,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-14 10:29:23,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-14 10:29:23,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-14 10:29:24,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-14 10:29:24,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-14 10:29:25,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-14 10:29:25,402 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:25,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-14 10:29:25,402 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,407 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:25,412 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:25,412 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:25,417 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:25,422 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:25,422 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:25,422 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:25,464 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:25,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:25,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5605c29f40> has no local changes
2025-01-14 10:29:25,513 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:25,521 [ scc.git] DEBUG [detached HEAD b0929da] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:25,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:25,521 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:25,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-14 10:29:25,821 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:25,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-14 10:29:25,821 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:25,831 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:25,831 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:25,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:25,842 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:25,842 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:25,842 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,847 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:25,887 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:25,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:25,892 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:25,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:25,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043af940> has no local changes
2025-01-14 10:29:25,936 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:25,944 [ scc.git] DEBUG [detached HEAD d29c6e5] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:25,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:25,944 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:26,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-14 10:29:26,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-14 10:29:27,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-14 10:29:27,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-14 10:29:28,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-14 10:29:28,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-14 10:29:29,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-14 10:29:29,159 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-14 10:29:29,159 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:29,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-14 10:29:29,159 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:29,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:29,165 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:29,170 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:29,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:29,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:29,181 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:29,181 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-14 10:29:29,515 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-14 10:29:29,515 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-14 10:29:29,519 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:29,519 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:29,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:29,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-14 10:29:29,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:29,535 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-14 10:29:29,545 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-14 10:29:29,545 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:29,548 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-14 10:29:29,548 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-14 10:29:29,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:29,714 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:29,755 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:29,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:29,761 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:29,802 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:29,809 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043695e0> has no local changes
2025-01-14 10:29:29,809 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:29,817 [ scc.git] DEBUG [detached HEAD 41d9475] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:29,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:29,818 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:30,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-14 10:29:30,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-14 10:29:31,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-14 10:29:31,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-14 10:29:32,157 [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-14 10:29:32,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-14 10:29:33,158 [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-14 10:29:33,159 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-14 10:29:33,159 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:33,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-14 10:29:33,159 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:33,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:33,165 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:33,170 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:33,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:33,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:33,180 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:33,180 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-14 10:29:33,579 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-14 10:29:33,579 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-14 10:29:33,584 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:33,584 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:33,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:33,589 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-14 10:29:33,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:33,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-14 10:29:33,646 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG Auto-merging setup.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-14 10:29:33,646 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:29:33,647 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:29:33,654 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-14 10:29:33,661 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-14 10:29:33,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:33,801 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-14 10:29:33,808 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-14 10:29:33,863 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2025-01-14 10:29:33,869 [ scc.config] DEBUG Found github.token
2025-01-14 10:29:33,870 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-14 10:29:33,870 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:33,911 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:33,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:33,918 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:33,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:33,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043697f0> has no local changes
2025-01-14 10:29:33,966 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:33,975 [ scc.git] DEBUG [detached HEAD 015cb25] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:33,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:33,975 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:34,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-14 10:29:34,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-14 10:29:35,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-14 10:29:35,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-14 10:29:36,295 [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-14 10:29:36,793 [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-14 10:29:37,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-14 10:29:37,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-14 10:29:38,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-14 10:29:38,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-14 10:29:39,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-14 10:29:39,574 [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-14 10:29:40,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-14 10:29:40,500 [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-14 10:29:40,500 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-14 10:29:40,501 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-14 10:29:40,501 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:40,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:40,507 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:40,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:40,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:40,517 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:40,523 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:40,524 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-14 10:29:41,004 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-14 10:29:41,004 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-14 10:29:41,009 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:41,009 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:41,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,015 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-14 10:29:41,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,028 [ 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-14 10:29:41,046 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-14 10:29:41,049 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-14 10:29:41,051 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-14 10:29:41,052 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-14 10:29:41,052 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-14 10:29:41,052 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-14 10:29:41,053 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-14 10:29:41,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:41,209 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:41,251 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:41,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,257 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:41,300 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:41,307 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5604369640> has no local changes
2025-01-14 10:29:41,307 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:41,317 [ scc.git] DEBUG [detached HEAD a8166a6] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:41,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:41,318 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:41,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-14 10:29:41,630 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:41,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-14 10:29:41,630 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:41,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,636 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:41,641 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:41,641 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:41,647 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:41,654 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:41,654 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:41,654 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:41,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,662 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:41,703 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:41,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:41,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:41,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:41,757 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043a3550> has no local changes
2025-01-14 10:29:41,757 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:41,766 [ scc.git] DEBUG [detached HEAD 22da346] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:41,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:41,766 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:42,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-14 10:29:42,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-14 10:29:43,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-14 10:29:43,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-14 10:29:44,048 [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-14 10:29:44,505 [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-14 10:29:45,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-14 10:29:45,422 [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-14 10:29:45,423 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-14 10:29:45,423 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:45,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-14 10:29:45,423 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:45,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:45,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:45,434 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:45,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:45,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:45,446 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:45,446 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-14 10:29:46,123 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-14 10:29:46,124 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-14 10:29:46,129 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:46,129 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:46,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:46,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-14 10:29:46,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:46,145 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-14 10:29:46,173 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:29:46,176 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-14 10:29:46,176 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-14 10:29:46,176 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-14 10:29:46,176 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-14 10:29:46,176 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-14 10:29:46,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:46,311 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:46,351 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:46,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:46,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:46,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:46,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043a3790> has no local changes
2025-01-14 10:29:46,403 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:46,412 [ scc.git] DEBUG [detached HEAD 4934b42] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:46,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:46,413 [ scc.git] INFO Overriding base-branch from master to main
2025-01-14 10:29:46,413 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:46,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-14 10:29:47,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-14 10:29:47,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-14 10:29:48,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-14 10:29:48,782 [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-14 10:29:49,386 [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-14 10:29:49,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-14 10:29:50,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-14 10:29:50,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-14 10:29:51,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-14 10:29:51,741 [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-14 10:29:52,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-14 10:29:52,704 [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-14 10:29:52,705 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-14 10:29:52,705 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:52,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-14 10:29:52,706 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:52,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:52,712 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-14 10:29:52,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:52,718 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-14 10:29:52,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-14 10:29:52,731 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:52,732 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-14 10:29:53,149 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-14 10:29:53,149 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-14 10:29:53,154 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:53,154 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:53,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-14 10:29:53,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-14 10:29:53,241 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-14 10:29:53,241 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-14 10:29:53,241 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:29:53,241 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:29:53,248 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-14 10:29:53,255 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-14 10:29:53,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:53,394 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-14 10:29:53,401 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-14 10:29:53,407 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-14 10:29:53,412 [ scc.config] DEBUG Found github.token
2025-01-14 10:29:53,413 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-14 10:29:53,413 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:53,456 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:53,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:53,504 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:53,511 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5604342580> has no local changes
2025-01-14 10:29:53,511 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:53,520 [ scc.git] DEBUG [detached HEAD 4da20c4] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:53,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:53,520 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:53,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-14 10:29:53,816 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:53,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-14 10:29:53,816 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:53,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:53,829 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:53,829 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:53,835 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:53,841 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:53,841 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:53,842 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:53,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,847 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:53,892 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:53,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:53,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:53,940 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:53,947 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56043424f0> has no local changes
2025-01-14 10:29:53,947 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:53,956 [ scc.git] DEBUG [detached HEAD ae1ea25] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:53,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:53,956 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:54,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-14 10:29:54,243 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:54,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-14 10:29:54,243 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:54,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:54,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:54,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:54,255 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:54,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:54,267 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:54,267 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:54,267 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:54,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:54,272 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:54,314 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:54,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:54,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:54,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:54,369 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5604353bb0> has no local changes
2025-01-14 10:29:54,369 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:54,380 [ scc.git] DEBUG [detached HEAD 5360cb6] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:54,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:54,381 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:54,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-14 10:29:55,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-14 10:29:55,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-14 10:29:56,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-14 10:29:56,586 [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-14 10:29:57,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-14 10:29:57,531 [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-14 10:29:57,531 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-14 10:29:57,531 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:29:57,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-14 10:29:57,532 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:57,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:57,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-14 10:29:57,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:29:57,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-14 10:29:57,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-14 10:29:57,553 [ scc.git] DEBUG Already up to date.
2025-01-14 10:29:57,553 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-14 10:29:58,260 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-14 10:29:58,260 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-14 10:29:58,265 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:29:58,265 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:58,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:58,271 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-14 10:29:58,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:58,282 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-14 10:29:58,386 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-14 10:29:58,386 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-14 10:29:58,386 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:29:58,387 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:29:58,394 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-14 10:29:58,402 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-14 10:29:58,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:29:58,545 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-14 10:29:58,551 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-14 10:29:58,556 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-14 10:29:58,560 [ scc.config] DEBUG Found github.token
2025-01-14 10:29:58,561 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-14 10:29:58,561 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:29:58,601 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:29:58,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:29:58,607 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:29:58,649 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:29:58,656 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56042faa30> has no local changes
2025-01-14 10:29:58,656 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:29:58,666 [ scc.git] DEBUG [detached HEAD a878328] merge master -Dorg -Ssuccess-only
2025-01-14 10:29:58,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:29:58,666 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-14 10:29:58,666 [ scc.repo] DEBUG ## PRs found:
2025-01-14 10:29:59,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-14 10:29:59,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-14 10:29:59,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-14 10:30:00,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-14 10:30:00,844 [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-14 10:30:01,306 [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-14 10:30:01,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-14 10:30:02,141 [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-14 10:30:02,141 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-14 10:30:02,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-14 10:30:03,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-14 10:30:03,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-14 10:30:03,921 [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-14 10:30:04,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-14 10:30:04,743 [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-14 10:30:04,743 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-14 10:30:05,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-14 10:30:05,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-14 10:30:06,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-14 10:30:06,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-14 10:30:06,713 [ scc.repo] DEBUG ## Branches found:
2025-01-14 10:30:06,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-14 10:30:06,713 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:30:06,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:30:06,727 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-14 10:30:06,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-14 10:30:06,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-14 10:30:06,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-14 10:30:06,753 [ scc.git] DEBUG Already up to date.
2025-01-14 10:30:06,753 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-14 10:30:07,408 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-14 10:30:07,408 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-14 10:30:07,415 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-14 10:30:08,063 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-14 10:30:08,064 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-14 10:30:08,069 [ scc.git] DEBUG ## Unique users: []
2025-01-14 10:30:08,069 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:30:08,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:30:08,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-14 10:30:08,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:30:08,093 [ 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-14 10:30:08,122 [ 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-14 10:30:08,122 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-14 10:30:08,123 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-14 10:30:08,132 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-14 10:30:08,140 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-14 10:30:08,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:08,286 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-14 10:30:08,296 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-14 10:30:08,303 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#306](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-14 10:30:08,309 [ scc.config] DEBUG Found github.token
2025-01-14 10:30:08,309 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-14 10:30:08,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-14 10:30:08,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:30:08,322 [ 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-14 10:30:08,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-14 10:30:08,351 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-14 10:30:08,352 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-14 10:30:08,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:08,690 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-14 10:30:08,739 [ scc.git] DEBUG Get sha1 of %s
2025-01-14 10:30:08,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-14 10:30:08,745 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:30:08,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:30:08,799 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56042fa670> has no local changes
2025-01-14 10:30:08,800 [ 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#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:30:08,810 [ scc.git] DEBUG [detached HEAD 3e345fe] merge master -Dorg -Ssuccess-only
2025-01-14 10:30:08,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:08,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-14 10:30:08,895 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-14 10:30:09,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:09,089 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-14 10:30:09,096 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-14 10:30:09,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:09,497 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-14 10:30:09,503 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-14 10:30:09,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:09,882 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-14 10:30:09,888 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-14 10:30:10,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:10,280 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-14 10:30:10,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:10,669 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-14 10:30:10,676 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-14 10:30:11,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:11,052 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-14 10:30:11,059 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-14 10:30:11,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:11,432 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-14 10:30:11,438 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-14 10:30:11,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:11,824 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-14 10:30:11,829 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-14 10:30:12,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:12,224 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-14 10:30:12,229 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-14 10:30:12,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:12,604 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-14 10:30:12,610 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-14 10:30:12,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:12,991 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-14 10:30:12,997 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-14 10:30:13,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:13,384 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-14 10:30:13,389 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-14 10:30:13,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:13,772 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-14 10:30:14,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:14,167 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-14 10:30:14,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:14,540 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-14 10:30:14,547 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-14 10:30:14,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:15,013 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-14 10:30:15,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:15,401 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-14 10:30:15,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:15,779 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-14 10:30:15,786 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-14 10:30:16,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:16,167 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-14 10:30:16,173 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-14 10:30:16,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:16,591 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-14 10:30:16,597 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-14 10:30:16,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:16,968 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-14 10:30:16,974 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-14 10:30:17,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-14 10:30:17,357 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-14 10:30:17,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-14 10:30:17,447 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5606d46370> has local changes
2025-01-14 10:30:17,447 [ 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'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#306 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/306/)'
2025-01-14 10:30:17,463 [ scc.git] DEBUG [detached HEAD 45e8cee] merge master -Dorg -Ssuccess-only
2025-01-14 10:30:17,463 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-14 10:30:17,463 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-14 10:30:17,463 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,463 [ scc.merge] INFO
2025-01-14 10:30:17,463 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,463 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-14 10:30:17,463 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-14 10:30:17,463 [ scc.merge] INFO
2025-01-14 10:30:17,463 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-14 10:30:17,463 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,463 [ scc.merge] INFO
2025-01-14 10:30:17,463 [ scc.merge] INFO
2025-01-14 10:30:17,463 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-14 10:30:17,463 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-14 10:30:17,464 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-14 10:30:17,464 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-14 10:30:17,464 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-14 10:30:17,464 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-14 10:30:17,464 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-14 10:30:17,464 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-14 10:30:17,464 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-14 10:30:17,464 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,464 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-14 10:30:17,464 [ scc.merge] INFO
2025-01-14 10:30:17,464 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-14 10:30:17,465 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-14 10:30:17,465 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-14 10:30:17,465 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-14 10:30:17,465 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-14 10:30:17,465 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-14 10:30:17,465 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,465 [ scc.merge] INFO
2025-01-14 10:30:17,465 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-14 10:30:17,465 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-14 10:30:17,466 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-14 10:30:17,466 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,466 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-14 10:30:17,466 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO
2025-01-14 10:30:17,466 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-14 10:30:17,467 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Repository: ome/scripts
2025-01-14 10:30:17,467 [ scc.merge] INFO Excluded PRs:
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-14 10:30:17,467 [ scc.merge] INFO Already up to date.
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Merged PRs:
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,467 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-14 10:30:17,467 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-14 10:30:17,467 [ scc.merge] INFO
2025-01-14 10:30:17,468 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-14 10:30:17,468 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-14 10:30:17,475 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-14 10:30:17,481 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-14 10:30:17,488 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-14 10:30:17,494 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-14 10:30:17,500 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-14 10:30:17,505 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-14 10:30:17,510 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-14 10:30:17,515 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-14 10:30:17,521 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-14 10:30:17,527 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-14 10:30:17,534 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-14 10:30:17,540 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-14 10:30:17,547 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-14 10:30:17,553 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-14 10:30:17,559 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-14 10:30:17,566 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-14 10:30:17,572 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-14 10:30:17,577 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-14 10:30:17,585 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-14 10:30:17,591 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-14 10:30:17,597 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-14 10:30:17,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-14 10:30:17,603 [ scc.git] DEBUG Calling 'git remote'
2025-01-14 10:30:17,608 [ 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 9283abc] 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 3136775] 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-14 10:31:04,873 [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-14 10:31:13,709 [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-14 10:31:15,975 [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-14 10:31:20,419 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-14 10:32:01,594 [ 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}
