Skipping 114 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-26 01:15:11,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:11,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:15:11,350 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:15:11,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:15:11,357 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:15:11,364 [ scc.git] DEBUG Already up to date.
2025-01-26 01:15:11,364 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-26 01:15:11,786 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-26 01:15:11,786 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-26 01:15:11,791 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:15:11,791 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:11,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:11,798 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-26 01:15:11,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:11,813 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-26 01:15:11,947 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-26 01:15:11,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:11,951 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-26 01:15:11,951 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-26 01:15:12,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:12,117 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:15:12,163 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:12,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:12,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:15:12,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:15:12,225 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2884a069a0> has no local changes
2025-01-26 01:15:12,226 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:15:12,236 [ scc.git] DEBUG [detached HEAD df02b1e] merge master -Dorg -Ssuccess-only
2025-01-26 01:15:12,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:15:12,237 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:15:12,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-26 01:15:13,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-26 01:15:13,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-26 01:15:14,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-26 01:15:14,085 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:14,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-26 01:15:15,103 [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-26 01:15:15,560 [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-26 01:15:16,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-26 01:15:16,532 [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-26 01:15:16,533 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-26 01:15:16,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-26 01:15:16,973 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:17,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-26 01:15:17,979 [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-26 01:15:18,491 [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-26 01:15:18,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-26 01:15:19,298 [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-26 01:15:19,299 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-26 01:15:19,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-26 01:15:19,770 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:20,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-26 01:15:20,787 [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-26 01:15:21,236 [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-26 01:15:21,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-26 01:15:22,074 [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-26 01:15:22,075 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-26 01:15:22,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-26 01:15:22,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-26 01:15:22,986 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:23,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-26 01:15:23,998 [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-26 01:15:24,537 [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-26 01:15:25,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-26 01:15:25,475 [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-26 01:15:25,475 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-26 01:15:25,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-26 01:15:25,917 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:26,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-26 01:15:26,912 [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-26 01:15:27,393 [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-26 01:15:27,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-26 01:15:28,231 [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-26 01:15:28,232 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-26 01:15:28,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-26 01:15:28,684 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:29,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-26 01:15:29,682 [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-26 01:15:30,170 [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-26 01:15:30,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-26 01:15:31,101 [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-26 01:15:31,102 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-26 01:15:31,102 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:15:31,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-26 01:15:31,103 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:31,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:31,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:15:31,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:15:31,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:15:31,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:15:31,125 [ scc.git] DEBUG Already up to date.
2025-01-26 01:15:31,126 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-26 01:15:31,438 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:31,438 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-26 01:15:31,442 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-26 01:15:31,739 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:31,740 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-26 01:15:31,744 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-26 01:15:32,048 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:32,048 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-26 01:15:32,053 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-26 01:15:32,340 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:32,340 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-26 01:15:32,345 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-26 01:15:32,637 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:32,638 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-26 01:15:32,643 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-26 01:15:32,930 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-26 01:15:32,931 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-26 01:15:32,936 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:15:32,936 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:32,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:32,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-26 01:15:32,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:32,961 [ 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-26 01:15:33,109 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:33,115 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-26 01:15:33,115 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-26 01:15:33,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:33,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-26 01:15:33,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:33,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-26 01:15:33,481 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-26 01:15:33,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:33,487 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-26 01:15:33,487 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-26 01:15:33,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:33,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-26 01:15:33,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:33,683 [ 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-26 01:15:33,748 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-26 01:15:33,749 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-26 01:15:33,749 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:15:33,749 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:15:33,755 [ scc.git] DEBUG Calling 'git reset --hard d105da511024efe59a5a5f9ab775663ea4cbce68'
2025-01-26 01:15:33,763 [ scc.git] DEBUG HEAD is now at d105da5 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-26 01:15:34,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:34,036 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-26 01:15:34,043 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-26 01:15:34,049 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/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-26 01:15:34,053 [ scc.config] DEBUG Found github.token
2025-01-26 01:15:34,054 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-26 01:15:34,054 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-26 01:15:34,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:34,114 [ 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-26 01:15:34,309 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-26 01:15:34,309 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:34,314 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-26 01:15:34,315 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-26 01:15:34,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:34,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-26 01:15:34,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:34,541 [ 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-26 01:15:34,628 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-26 01:15:34,629 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:34,635 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-26 01:15:34,635 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-26 01:15:34,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:34,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-26 01:15:34,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:34,864 [ 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-26 01:15:34,975 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-26 01:15:34,976 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-26 01:15:34,976 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:15:34,976 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:15:34,984 [ scc.git] DEBUG Calling 'git reset --hard e1cbdf188298d6f1cb808f01ae544f598bde512e'
2025-01-26 01:15:34,993 [ scc.git] DEBUG HEAD is now at e1cbdf1 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-26 01:15:35,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:35,224 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-26 01:15:35,231 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-26 01:15:35,238 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/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-26 01:15:35,243 [ scc.config] DEBUG Found github.token
2025-01-26 01:15:35,244 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-26 01:15:35,244 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:15:35,289 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:35,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:35,296 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:15:35,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:15:35,349 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28849f8b20> has no local changes
2025-01-26 01:15:35,349 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:15:35,359 [ scc.git] DEBUG [detached HEAD acdbda2] merge master -Dorg -Ssuccess-only
2025-01-26 01:15:35,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:15:35,360 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:15:35,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-26 01:15:36,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-26 01:15:36,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-26 01:15:37,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-26 01:15:37,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-26 01:15:38,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-26 01:15:38,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-26 01:15:38,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/c6029c6c1e486fdfbc75552eba8472e754975925?per_page=1 HTTP/1.1" 200 2
2025-01-26 01:15:38,937 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-26 01:15:39,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-26 01:15:39,366 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:15:39,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-26 01:15:40,396 [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-26 01:15:40,872 [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-26 01:15:41,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-26 01:15:41,803 [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-26 01:15:41,804 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-26 01:15:42,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-26 01:15:42,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-26 01:15:43,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-26 01:15:43,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-26 01:15:44,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-26 01:15:44,497 [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-26 01:15:44,930 [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-26 01:15:45,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-26 01:15:45,745 [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-26 01:15:45,746 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-26 01:15:46,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-26 01:15:46,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-26 01:15:47,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-26 01:15:47,695 [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-26 01:15:48,129 [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-26 01:15:48,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-26 01:15:48,947 [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-26 01:15:48,948 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-26 01:15:49,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-26 01:15:49,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-26 01:15:50,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-26 01:15:50,800 [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-26 01:15:51,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-26 01:15:51,635 [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-26 01:15:51,636 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-26 01:15:51,636 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:15:51,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-26 01:15:51,636 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:51,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:51,643 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:15:51,649 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:15:51,649 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:15:51,655 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:15:51,661 [ scc.git] DEBUG Already up to date.
2025-01-26 01:15:51,662 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-26 01:15:53,676 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-26 01:15:53,677 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-26 01:15:53,682 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-26 01:15:55,692 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-26 01:15:55,692 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-26 01:15:55,697 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-26 01:15:56,116 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-26 01:15:56,116 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-26 01:15:56,122 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-26 01:15:56,407 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-26 01:15:56,407 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-26 01:15:56,412 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-26 01:15:58,352 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-26 01:15:58,353 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-26 01:15:58,367 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:15:58,368 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:15:58,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:58,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-26 01:15:58,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:58,396 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-26 01:15:58,568 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-26 01:15:58,618 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:58,629 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-26 01:15:58,629 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-26 01:15:58,629 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-26 01:15:58,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:58,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-26 01:15:58,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:58,808 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-26 01:15:59,353 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-26 01:15:59,353 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-26 01:15:59,353 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-26 01:15:59,353 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-26 01:15:59,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:59,360 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-26 01:15:59,360 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-26 01:15:59,360 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-26 01:15:59,360 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-26 01:15:59,360 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-26 01:15:59,360 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-26 01:15:59,360 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-26 01:15:59,360 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-26 01:15:59,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:59,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-26 01:15:59,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:15:59,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-26 01:15:59,587 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-26 01:15:59,588 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:15:59,592 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-26 01:15:59,592 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-26 01:15:59,592 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-26 01:15:59,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:15:59,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-26 01:16:00,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:00,068 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-26 01:16:00,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:00,368 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-26 01:16:00,368 [ scc.git] DEBUG package.json | 2 +-
2025-01-26 01:16:00,368 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-26 01:16:00,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:00,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-26 01:16:00,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:00,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-26 01:16:01,117 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-26 01:16:01,117 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-26 01:16:01,117 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-26 01:16:01,117 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-26 01:16:01,117 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-26 01:16:01,138 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:01,146 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-26 01:16:01,146 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-26 01:16:01,146 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-26 01:16:01,146 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-26 01:16:01,147 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-26 01:16:01,147 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-26 01:16:01,147 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-26 01:16:01,147 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-26 01:16:01,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:01,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:01,322 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:01,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:01,328 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:01,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:01,381 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28849ebe80> has no local changes
2025-01-26 01:16:01,381 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:01,392 [ scc.git] DEBUG [detached HEAD bc80074] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:01,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:01,393 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:01,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-26 01:16:02,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-26 01:16:02,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-26 01:16:03,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-26 01:16:03,639 [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-26 01:16:04,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-26 01:16:04,516 [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-26 01:16:04,517 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-26 01:16:04,517 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:04,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-26 01:16:04,517 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:04,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:04,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:04,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:04,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:04,537 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:04,545 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:04,545 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-26 01:16:05,268 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-26 01:16:05,268 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-26 01:16:05,273 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:05,273 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:05,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:05,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-26 01:16:05,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:05,304 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-26 01:16:05,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:05,320 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-26 01:16:05,320 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-26 01:16:05,320 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-26 01:16:05,320 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-26 01:16:05,320 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-26 01:16:05,320 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-26 01:16:05,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:05,453 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:05,499 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:05,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:05,506 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:05,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:05,557 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f288418d5b0> has no local changes
2025-01-26 01:16:05,558 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:05,568 [ scc.git] DEBUG [detached HEAD 23002f9] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:05,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:05,568 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:05,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-26 01:16:06,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-26 01:16:06,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-26 01:16:07,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-26 01:16:07,839 [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-26 01:16:08,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-26 01:16:08,717 [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-26 01:16:08,717 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-26 01:16:09,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-26 01:16:09,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-26 01:16:10,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-26 01:16:10,566 [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-26 01:16:11,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-26 01:16:11,492 [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-26 01:16:11,493 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-26 01:16:11,493 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:11,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-26 01:16:11,493 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:11,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:11,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:11,511 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:11,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:11,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:11,524 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:11,524 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-26 01:16:12,620 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-26 01:16:12,620 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-26 01:16:12,626 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-26 01:16:13,358 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-26 01:16:13,358 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-26 01:16:13,363 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:13,364 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:13,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:13,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-26 01:16:13,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:13,381 [ 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-26 01:16:13,619 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-26 01:16:13,620 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-26 01:16:13,620 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-26 01:16:13,620 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-26 01:16:13,620 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:16:13,621 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:16:13,627 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-26 01:16:13,633 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-26 01:16:13,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:13,764 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-26 01:16:13,772 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-26 01:16:13,808 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-26 01:16:13,814 [ scc.config] DEBUG Found github.token
2025-01-26 01:16:13,814 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-26 01:16:13,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-26 01:16:13,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:13,829 [ 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-26 01:16:13,978 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-26 01:16:13,978 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-26 01:16:13,979 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-26 01:16:13,979 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:16:13,979 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:16:13,988 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-26 01:16:13,997 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-26 01:16:14,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:14,145 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-26 01:16:14,153 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-26 01:16:14,161 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/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-26 01:16:14,166 [ scc.config] DEBUG Found github.token
2025-01-26 01:16:14,167 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-26 01:16:14,167 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:14,213 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:14,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:14,220 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:14,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:14,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28841a0b80> has no local changes
2025-01-26 01:16:14,275 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:14,286 [ scc.git] DEBUG [detached HEAD ccf38d5] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:14,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:14,286 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:14,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-26 01:16:15,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-01-26 01:16:15,144 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-26 01:16:15,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-26 01:16:16,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-26 01:16:16,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-26 01:16:17,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-26 01:16:17,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-01-26 01:16:17,584 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-26 01:16:18,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-26 01:16:18,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-26 01:16:18,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-26 01:16:19,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-26 01:16:19,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-26 01:16:20,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-26 01:16:20,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-26 01:16:20,809 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:20,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-26 01:16:20,809 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:20,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:20,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:20,822 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:20,822 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:20,827 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:20,833 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:20,833 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-01-26 01:16:21,200 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-01-26 01:16:21,200 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-01-26 01:16:21,204 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:21,204 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:21,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:21,210 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-26 01:16:21,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:21,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-26 01:16:21,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:21,424 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-01-26 01:16:21,424 [ scc.git] DEBUG package.json | 2 +-
2025-01-26 01:16:21,424 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-01-26 01:16:21,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:21,558 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:21,602 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:21,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:21,610 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:21,654 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:21,662 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28849b4f40> has no local changes
2025-01-26 01:16:21,662 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:21,726 [ scc.git] DEBUG [detached HEAD 169ab83] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:21,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:21,727 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:21,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-26 01:16:21,964 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:21,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-26 01:16:21,964 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:21,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:21,971 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:21,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:21,977 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:21,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:21,990 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:21,990 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:21,990 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:21,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:21,996 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:22,040 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:22,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:22,047 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:22,091 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:22,098 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2884143940> has no local changes
2025-01-26 01:16:22,099 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:22,110 [ scc.git] DEBUG [detached HEAD f6789dd] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:22,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:22,111 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:22,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-26 01:16:22,363 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:22,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-26 01:16:22,363 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:22,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:22,370 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:22,375 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:22,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:22,381 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:22,387 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:22,387 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:22,387 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:22,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:22,394 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:22,434 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:22,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:22,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:22,483 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:22,490 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840fd5e0> has no local changes
2025-01-26 01:16:22,490 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:22,500 [ scc.git] DEBUG [detached HEAD c7c18cb] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:22,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:22,501 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:22,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-26 01:16:23,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-26 01:16:23,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-26 01:16:24,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-26 01:16:24,715 [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-26 01:16:25,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-26 01:16:25,524 [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-26 01:16:25,525 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-26 01:16:25,525 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:25,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-26 01:16:25,525 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:25,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:25,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:25,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:25,537 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:25,543 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:25,549 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:25,549 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-26 01:16:26,010 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-26 01:16:26,011 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-26 01:16:26,027 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:26,027 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:26,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:26,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-26 01:16:26,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:26,045 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-26 01:16:26,125 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG Auto-merging setup.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-26 01:16:26,126 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:16:26,126 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:16:26,132 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-26 01:16:26,139 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-26 01:16:26,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:26,269 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-26 01:16:26,276 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-26 01:16:26,382 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-01-26 01:16:26,388 [ scc.config] DEBUG Found github.token
2025-01-26 01:16:26,389 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-26 01:16:26,389 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:26,434 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:26,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:26,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:26,485 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:26,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840fd7f0> has no local changes
2025-01-26 01:16:26,493 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:26,504 [ scc.git] DEBUG [detached HEAD edb7055] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:26,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:26,505 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:26,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-26 01:16:27,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-26 01:16:27,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-26 01:16:28,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-26 01:16:28,647 [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-26 01:16:29,086 [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-26 01:16:29,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-26 01:16:29,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-26 01:16:30,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-26 01:16:30,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-26 01:16:31,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-26 01:16:31,752 [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-26 01:16:32,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-26 01:16:32,577 [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-26 01:16:32,577 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-26 01:16:32,578 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:32,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-26 01:16:32,578 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:32,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:32,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:32,591 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:32,591 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:32,598 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:32,604 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:32,605 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-26 01:16:33,451 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-26 01:16:33,451 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-26 01:16:33,456 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:33,456 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:33,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:33,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-26 01:16:33,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:33,475 [ 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-26 01:16:33,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:33,576 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-26 01:16:33,576 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-26 01:16:33,576 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-26 01:16:33,576 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-26 01:16:33,577 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-26 01:16:33,577 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-26 01:16:33,577 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-26 01:16:33,577 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-26 01:16:33,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-26 01:16:33,579 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-26 01:16:33,579 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-26 01:16:33,579 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-26 01:16:33,579 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-26 01:16:33,579 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-26 01:16:33,579 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-26 01:16:33,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-26 01:16:33,580 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-26 01:16:33,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:33,710 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:33,758 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:33,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:33,764 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:33,808 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:33,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840fd640> has no local changes
2025-01-26 01:16:33,816 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:33,827 [ scc.git] DEBUG [detached HEAD ac89099] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:33,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:33,827 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:34,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-26 01:16:34,162 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:34,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-26 01:16:34,162 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:34,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:34,168 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:34,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:34,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:34,180 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:34,186 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:34,187 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:34,187 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:34,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:34,192 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:34,236 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:34,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:34,244 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:34,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:34,296 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f288415f550> has no local changes
2025-01-26 01:16:34,296 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:34,306 [ scc.git] DEBUG [detached HEAD ca1b0a4] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:34,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:34,306 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:34,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-26 01:16:35,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-26 01:16:35,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-26 01:16:36,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-26 01:16:36,500 [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-26 01:16:36,946 [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-26 01:16:37,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-26 01:16:37,870 [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-26 01:16:37,871 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-26 01:16:37,871 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:37,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-26 01:16:37,872 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:37,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:37,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:37,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:37,889 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:37,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:37,903 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:37,903 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-26 01:16:38,759 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-26 01:16:38,760 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-26 01:16:38,765 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:38,765 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:38,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:38,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-26 01:16:38,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:38,786 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-26 01:16:38,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:16:38,825 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-26 01:16:38,826 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-26 01:16:38,826 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-26 01:16:38,826 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-26 01:16:38,826 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-26 01:16:39,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:39,023 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:39,078 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:39,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:39,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:39,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:39,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f288415f790> has no local changes
2025-01-26 01:16:39,132 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:39,140 [ scc.git] DEBUG [detached HEAD 1621888] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:39,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:39,141 [ scc.git] INFO Overriding base-branch from master to main
2025-01-26 01:16:39,141 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:39,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-26 01:16:39,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-26 01:16:40,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-26 01:16:40,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-26 01:16:41,389 [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-26 01:16:41,824 [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-26 01:16:42,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-26 01:16:42,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-26 01:16:43,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-26 01:16:43,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-26 01:16:44,122 [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-26 01:16:44,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-26 01:16:45,038 [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-26 01:16:45,039 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-26 01:16:45,039 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:45,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-26 01:16:45,039 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:45,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:45,046 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-26 01:16:45,050 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:45,050 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-26 01:16:45,056 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-26 01:16:45,062 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:45,062 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-26 01:16:45,602 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-26 01:16:45,602 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-26 01:16:45,607 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:45,607 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:45,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:45,619 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-26 01:16:45,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:45,633 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-26 01:16:45,808 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-26 01:16:45,808 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-26 01:16:45,809 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:16:45,809 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:16:45,816 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-26 01:16:45,822 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-26 01:16:45,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:45,956 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-26 01:16:45,963 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-26 01:16:45,969 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-26 01:16:45,975 [ scc.config] DEBUG Found github.token
2025-01-26 01:16:45,975 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-26 01:16:45,975 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:46,019 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:46,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:46,079 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840d5580> has no local changes
2025-01-26 01:16:46,079 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:46,090 [ scc.git] DEBUG [detached HEAD cf539f5] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:46,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:46,091 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:46,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-26 01:16:46,353 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:46,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-26 01:16:46,353 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,359 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:46,365 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:46,365 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:46,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:46,378 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:46,378 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:46,378 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,384 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:46,427 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:46,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:46,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840d54f0> has no local changes
2025-01-26 01:16:46,494 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:46,504 [ scc.git] DEBUG [detached HEAD cfffb3d] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:46,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:46,504 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:46,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-26 01:16:46,748 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:46,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-26 01:16:46,749 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,755 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:46,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:46,760 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:46,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:46,774 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:46,774 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:46,774 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,780 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:46,824 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:46,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:46,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:46,874 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:46,881 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28840e6bb0> has no local changes
2025-01-26 01:16:46,882 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:46,891 [ scc.git] DEBUG [detached HEAD bd3f1b2] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:46,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:46,892 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:47,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-26 01:16:47,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-26 01:16:48,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-26 01:16:48,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-26 01:16:49,041 [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-26 01:16:49,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-26 01:16:49,834 [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-26 01:16:49,835 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-26 01:16:49,835 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:49,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-26 01:16:49,835 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:49,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:49,841 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-26 01:16:49,846 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:49,847 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-26 01:16:49,853 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-26 01:16:49,860 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:49,860 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-26 01:16:50,495 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-26 01:16:50,495 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-26 01:16:50,500 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:16:50,500 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:50,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:50,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-26 01:16:50,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:50,518 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-26 01:16:50,617 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-26 01:16:50,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-26 01:16:50,618 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:16:50,618 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:16:50,627 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-26 01:16:50,636 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-26 01:16:50,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:16:50,772 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-26 01:16:50,779 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-26 01:16:50,784 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-26 01:16:50,788 [ scc.config] DEBUG Found github.token
2025-01-26 01:16:50,788 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-26 01:16:50,789 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:16:50,831 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:50,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:50,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:16:50,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:16:50,890 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f288408ea30> has no local changes
2025-01-26 01:16:50,890 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:16:50,901 [ scc.git] DEBUG [detached HEAD 0b22ef7] merge master -Dorg -Ssuccess-only
2025-01-26 01:16:50,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:16:50,901 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-26 01:16:50,901 [ scc.repo] DEBUG ## PRs found:
2025-01-26 01:16:51,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-26 01:16:51,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-26 01:16:52,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-26 01:16:52,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-26 01:16:53,012 [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-26 01:16:53,445 [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-26 01:16:53,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-26 01:16:54,292 [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-26 01:16:54,293 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-26 01:16:54,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-26 01:16:55,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-26 01:16:55,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-26 01:16:56,025 [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-26 01:16:56,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-26 01:16:56,820 [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-26 01:16:56,820 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-26 01:16:57,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-26 01:16:57,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-26 01:16:58,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-26 01:16:58,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-26 01:16:58,719 [ scc.repo] DEBUG ## Branches found:
2025-01-26 01:16:58,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-26 01:16:58,720 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:16:58,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:16:58,726 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-26 01:16:58,731 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-26 01:16:58,731 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-26 01:16:58,737 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-26 01:16:58,743 [ scc.git] DEBUG Already up to date.
2025-01-26 01:16:58,743 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-26 01:16:59,550 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-26 01:16:59,550 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-26 01:16:59,555 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-26 01:17:00,241 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-26 01:17:00,241 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-26 01:17:00,246 [ scc.git] DEBUG ## Unique users: []
2025-01-26 01:17:00,246 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:17:00,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:17:00,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-26 01:17:00,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:17:00,268 [ 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-26 01:17:00,294 [ 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-26 01:17:00,294 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-26 01:17:00,295 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-26 01:17:00,301 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-26 01:17:00,308 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-26 01:17:00,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:00,440 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-26 01:17:00,449 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-26 01:17:00,456 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#316](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-26 01:17:00,462 [ scc.config] DEBUG Found github.token
2025-01-26 01:17:00,462 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-26 01:17:00,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-26 01:17:00,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:17:00,477 [ 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-26 01:17:00,501 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-26 01:17:00,504 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-26 01:17:00,504 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-26 01:17:00,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:00,826 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-26 01:17:00,870 [ scc.git] DEBUG Get sha1 of %s
2025-01-26 01:17:00,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-26 01:17:00,879 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:17:00,924 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:17:00,932 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f288408e670> has no local changes
2025-01-26 01:17:00,933 [ 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#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:17:00,943 [ scc.git] DEBUG [detached HEAD bd8483c] merge master -Dorg -Ssuccess-only
2025-01-26 01:17:00,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:00,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-26 01:17:01,027 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-26 01:17:01,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:01,221 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-26 01:17:01,226 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-26 01:17:01,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:01,596 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-26 01:17:01,602 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-26 01:17:01,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:01,977 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-26 01:17:01,981 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-26 01:17:02,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:02,362 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-26 01:17:02,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:02,743 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-26 01:17:02,748 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-26 01:17:03,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:03,125 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-26 01:17:03,131 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-26 01:17:03,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:03,507 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-26 01:17:03,512 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-26 01:17:03,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:03,891 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-26 01:17:03,896 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-26 01:17:04,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:04,275 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-26 01:17:04,280 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-26 01:17:04,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:04,654 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-26 01:17:04,659 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-26 01:17:05,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:05,038 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-26 01:17:05,044 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-26 01:17:05,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:05,420 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-26 01:17:05,425 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-26 01:17:05,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:05,824 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-26 01:17:06,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:06,199 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-26 01:17:06,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:06,571 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-26 01:17:06,575 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-26 01:17:06,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:06,952 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-26 01:17:07,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:07,348 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-26 01:17:07,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:07,721 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-26 01:17:07,728 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-26 01:17:08,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:08,099 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-26 01:17:08,105 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-26 01:17:08,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:08,488 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-26 01:17:08,493 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-26 01:17:08,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:08,866 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-26 01:17:08,871 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-26 01:17:09,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-26 01:17:09,272 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-26 01:17:09,272 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-26 01:17:09,349 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2885ad8370> has local changes
2025-01-26 01:17:09,349 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
- PR 610 will-moore 'Add docs/contributing.rst'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
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.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#316 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/316/)'
2025-01-26 01:17:09,426 [ scc.git] DEBUG [detached HEAD be81a04] merge master -Dorg -Ssuccess-only
2025-01-26 01:17:09,426 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-26 01:17:09,426 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-26 01:17:09,426 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,426 [ scc.merge] INFO
2025-01-26 01:17:09,426 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,426 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-26 01:17:09,426 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-26 01:17:09,426 [ scc.merge] INFO
2025-01-26 01:17:09,426 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-26 01:17:09,426 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,426 [ scc.merge] INFO
2025-01-26 01:17:09,426 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-26 01:17:09,427 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-26 01:17:09,427 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-26 01:17:09,427 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-26 01:17:09,427 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-26 01:17:09,427 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-26 01:17:09,427 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-26 01:17:09,427 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-26 01:17:09,427 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,427 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
2025-01-26 01:17:09,427 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-01-26 01:17:09,427 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-26 01:17:09,428 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-26 01:17:09,428 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-26 01:17:09,428 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-26 01:17:09,428 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-26 01:17:09,428 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,428 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-26 01:17:09,428 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,428 [ scc.merge] INFO
2025-01-26 01:17:09,428 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-26 01:17:09,429 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-26 01:17:09,429 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-26 01:17:09,429 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-26 01:17:09,429 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-26 01:17:09,429 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-26 01:17:09,429 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-26 01:17:09,429 [ scc.merge] INFO
2025-01-26 01:17:09,429 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-26 01:17:09,429 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-26 01:17:09,429 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-26 01:17:09,430 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-26 01:17:09,430 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,430 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-26 01:17:09,430 [ scc.merge] INFO
2025-01-26 01:17:09,430 [ scc.merge] INFO Repository: ome/scripts
2025-01-26 01:17:09,430 [ scc.merge] INFO Excluded PRs:
2025-01-26 01:17:09,431 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-26 01:17:09,431 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-26 01:17:09,431 [ scc.merge] INFO Already up to date.
2025-01-26 01:17:09,431 [ scc.merge] INFO
2025-01-26 01:17:09,431 [ scc.merge] INFO Merged PRs:
2025-01-26 01:17:09,431 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-26 01:17:09,431 [ scc.merge] INFO
2025-01-26 01:17:09,431 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-26 01:17:09,431 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-26 01:17:09,431 [ scc.merge] INFO
2025-01-26 01:17:09,431 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-26 01:17:09,431 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-26 01:17:09,438 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-26 01:17:09,443 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-26 01:17:09,448 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-26 01:17:09,453 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-26 01:17:09,458 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-26 01:17:09,464 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-26 01:17:09,470 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-26 01:17:09,475 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-26 01:17:09,480 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-26 01:17:09,486 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-26 01:17:09,491 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-26 01:17:09,497 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-26 01:17:09,502 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-26 01:17:09,507 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-26 01:17:09,513 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-26 01:17:09,518 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-26 01:17:09,524 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-26 01:17:09,529 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-26 01:17:09,535 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-26 01:17:09,541 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-26 01:17:09,547 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-26 01:17:09,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-26 01:17:09,552 [ scc.git] DEBUG Calling 'git remote'
2025-01-26 01:17:09,558 [ 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 14685b0] 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 721fa4a] 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-26 01:17:56,799 [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-26 01:18:05,425 [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-26 01:18:07,706 [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-26 01:18:12,088 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-26 01:18:50,895 [ 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}
