Skipping 109 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-22 01:13:59,365 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-22 01:13:59,365 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:13:59,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-22 01:13:59,366 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:13:59,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:13:59,371 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:13:59,376 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:13:59,376 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:13:59,382 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:13:59,388 [ scc.git] DEBUG Already up to date.
2025-01-22 01:13:59,388 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-22 01:13:59,771 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-22 01:13:59,772 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-22 01:13:59,776 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:13:59,776 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:13:59,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:13:59,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-22 01:13:59,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:13:59,791 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-22 01:13:59,812 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-22 01:13:59,813 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:13:59,815 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-22 01:13:59,815 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-22 01:13:59,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:13:59,947 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:13:59,986 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:13:59,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:13:59,991 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:14:00,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:14:00,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85db13e20> has no local changes
2025-01-22 01:14:00,038 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:14:00,046 [ scc.git] DEBUG [detached HEAD 2502053] merge master -Dorg -Ssuccess-only
2025-01-22 01:14:00,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:14:00,047 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:14:00,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-22 01:14:00,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-22 01:14:01,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-22 01:14:01,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-22 01:14:01,987 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:02,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-22 01:14:03,090 [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-22 01:14:03,632 [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-22 01:14:04,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-22 01:14:04,462 [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-22 01:14:04,463 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-22 01:14:04,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-22 01:14:04,925 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:05,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-22 01:14:06,107 [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-22 01:14:06,611 [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-22 01:14:07,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-22 01:14:07,527 [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-22 01:14:07,528 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-22 01:14:08,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-22 01:14:08,007 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:08,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-22 01:14:09,017 [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-22 01:14:09,583 [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-22 01:14:10,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-22 01:14:10,542 [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-22 01:14:10,543 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-22 01:14:10,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-22 01:14:11,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-22 01:14:11,420 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:11,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-22 01:14:12,493 [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-22 01:14:12,988 [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-22 01:14:13,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-22 01:14:13,944 [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-22 01:14:13,945 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-22 01:14:14,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-22 01:14:14,414 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:14,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-22 01:14:15,489 [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-22 01:14:16,143 [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-22 01:14:16,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-22 01:14:17,077 [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-22 01:14:17,078 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-22 01:14:17,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-22 01:14:17,556 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:18,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-22 01:14:18,554 [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-22 01:14:19,120 [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-22 01:14:19,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-22 01:14:20,027 [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-22 01:14:20,029 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-22 01:14:20,029 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:14:20,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-22 01:14:20,029 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:20,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:20,036 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:14:20,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:14:20,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:14:20,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:14:20,053 [ scc.git] DEBUG Already up to date.
2025-01-22 01:14:20,053 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-22 01:14:20,405 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:20,405 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-22 01:14:20,410 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-22 01:14:20,710 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:20,710 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-22 01:14:20,716 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-22 01:14:21,002 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:21,002 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-22 01:14:21,008 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-22 01:14:21,301 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:21,301 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-22 01:14:21,306 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-22 01:14:21,651 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:21,651 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-22 01:14:21,656 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-22 01:14:21,947 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-22 01:14:21,947 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-22 01:14:21,953 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:14:21,953 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:21,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:21,959 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-22 01:14:22,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:22,028 [ 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-22 01:14:22,057 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:22,062 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-22 01:14:22,062 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-22 01:14:22,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:22,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-22 01:14:22,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:22,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-22 01:14:22,343 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-22 01:14:22,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:22,349 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-22 01:14:22,349 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-22 01:14:22,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:22,575 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-22 01:14:22,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:22,602 [ 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-22 01:14:22,759 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-22 01:14:22,759 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-22 01:14:22,759 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:14:22,759 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:14:22,765 [ scc.git] DEBUG Calling 'git reset --hard cc6af2912006950f648c803099e6d87409f3f26d'
2025-01-22 01:14:22,773 [ scc.git] DEBUG HEAD is now at cc6af29 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-22 01:14:22,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:22,963 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-22 01:14:22,969 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-22 01:14:22,975 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/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-22 01:14:22,980 [ scc.config] DEBUG Found github.token
2025-01-22 01:14:22,981 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-22 01:14:22,981 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-22 01:14:22,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:22,997 [ 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-22 01:14:23,123 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-22 01:14:23,124 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:23,130 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-22 01:14:23,130 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-22 01:14:23,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:23,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-22 01:14:23,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:23,435 [ 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-22 01:14:23,470 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-22 01:14:23,470 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:23,475 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-22 01:14:23,475 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-22 01:14:23,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:23,734 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-22 01:14:23,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:23,748 [ 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-22 01:14:23,925 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-22 01:14:23,925 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-22 01:14:23,925 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:14:23,926 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:14:23,932 [ scc.git] DEBUG Calling 'git reset --hard 2415ae93ae7fc07b6eaa8aa1a197ff3de3a97d94'
2025-01-22 01:14:23,940 [ scc.git] DEBUG HEAD is now at 2415ae9 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-22 01:14:24,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:24,130 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-22 01:14:24,137 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-22 01:14:24,143 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/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-22 01:14:24,148 [ scc.config] DEBUG Found github.token
2025-01-22 01:14:24,148 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-22 01:14:24,149 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:14:24,189 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:24,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:24,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:14:24,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:14:24,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85db05b20> has no local changes
2025-01-22 01:14:24,239 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:14:24,247 [ scc.git] DEBUG [detached HEAD 13ac8cd] merge master -Dorg -Ssuccess-only
2025-01-22 01:14:24,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:14:24,248 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:14:24,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-22 01:14:25,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-22 01:14:25,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-22 01:14:26,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-22 01:14:26,614 [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-22 01:14:27,042 [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-22 01:14:27,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-22 01:14:27,898 [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-22 01:14:27,898 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-22 01:14:28,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-22 01:14:28,370 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:14:28,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-22 01:14:29,413 [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-22 01:14:29,957 [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-22 01:14:30,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-22 01:14:30,932 [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-22 01:14:30,933 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-22 01:14:31,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-22 01:14:31,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-22 01:14:32,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-22 01:14:32,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-22 01:14:33,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-22 01:14:33,722 [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-22 01:14:34,204 [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-22 01:14:34,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-22 01:14:35,084 [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-22 01:14:35,084 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-22 01:14:35,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-22 01:14:35,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-22 01:14:36,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-22 01:14:36,955 [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-22 01:14:37,381 [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-22 01:14:37,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-22 01:14:38,255 [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-22 01:14:38,255 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-22 01:14:38,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-22 01:14:39,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-22 01:14:39,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-22 01:14:40,162 [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-22 01:14:40,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-22 01:14:41,168 [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-22 01:14:41,168 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-22 01:14:41,169 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:14:41,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-22 01:14:41,169 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:41,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:41,175 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:14:41,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:14:41,180 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:14:41,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:14:41,191 [ scc.git] DEBUG Already up to date.
2025-01-22 01:14:41,192 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-22 01:14:43,184 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-22 01:14:43,185 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-22 01:14:43,189 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-22 01:14:44,611 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-22 01:14:44,611 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-22 01:14:44,616 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-22 01:14:44,980 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-22 01:14:44,980 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-22 01:14:44,985 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-22 01:14:45,269 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-22 01:14:45,269 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-22 01:14:45,273 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-22 01:14:46,126 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-22 01:14:46,126 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-22 01:14:46,130 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:14:46,130 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:46,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:46,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-22 01:14:46,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:46,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-22 01:14:46,235 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-22 01:14:46,236 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:46,240 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-22 01:14:46,240 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-22 01:14:46,240 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-22 01:14:46,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:46,380 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-22 01:14:46,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:46,394 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-22 01:14:46,795 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-22 01:14:46,795 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-22 01:14:46,795 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-22 01:14:46,795 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-22 01:14:46,795 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:46,800 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-22 01:14:46,800 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-22 01:14:46,800 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-22 01:14:46,800 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-22 01:14:46,800 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-22 01:14:46,800 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-22 01:14:46,800 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-22 01:14:46,800 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-22 01:14:46,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:46,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-22 01:14:46,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:46,949 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-22 01:14:46,972 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-22 01:14:46,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:46,976 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-22 01:14:46,976 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-22 01:14:46,976 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-22 01:14:47,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:47,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-22 01:14:47,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:47,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-22 01:14:47,461 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:47,471 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-22 01:14:47,471 [ scc.git] DEBUG package.json | 2 +-
2025-01-22 01:14:47,471 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-22 01:14:47,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:47,706 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-22 01:14:47,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:47,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-22 01:14:47,826 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-22 01:14:47,826 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-22 01:14:47,826 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-22 01:14:47,826 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-22 01:14:47,826 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-22 01:14:47,826 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:47,832 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-22 01:14:47,832 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-22 01:14:47,832 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-22 01:14:47,832 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-22 01:14:47,832 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-22 01:14:47,832 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-22 01:14:47,832 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-22 01:14:47,832 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-22 01:14:48,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:48,090 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:14:48,131 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:48,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:48,136 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:14:48,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:14:48,187 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85dad5e80> has no local changes
2025-01-22 01:14:48,187 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:14:48,197 [ scc.git] DEBUG [detached HEAD a1b1974] merge master -Dorg -Ssuccess-only
2025-01-22 01:14:48,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:14:48,197 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:14:48,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-22 01:14:49,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-22 01:14:49,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-22 01:14:50,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-22 01:14:50,517 [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-22 01:14:51,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-22 01:14:51,440 [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-22 01:14:51,441 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-22 01:14:51,441 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:14:51,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-22 01:14:51,441 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:51,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:51,447 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:14:51,452 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:14:51,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:14:51,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:14:51,462 [ scc.git] DEBUG Already up to date.
2025-01-22 01:14:51,463 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-22 01:14:52,479 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-22 01:14:52,479 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-22 01:14:52,485 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:14:52,485 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:52,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:52,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-22 01:14:52,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:52,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-22 01:14:52,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:14:52,516 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-22 01:14:52,516 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-22 01:14:52,516 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-22 01:14:52,516 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-22 01:14:52,516 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-22 01:14:52,516 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-22 01:14:52,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:14:52,734 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:14:52,778 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:52,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:52,784 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:14:52,828 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:14:52,836 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c2985b0> has no local changes
2025-01-22 01:14:52,836 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:14:52,846 [ scc.git] DEBUG [detached HEAD 6729d0b] merge master -Dorg -Ssuccess-only
2025-01-22 01:14:52,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:14:52,847 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:14:53,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-22 01:14:53,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-22 01:14:54,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-22 01:14:54,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-22 01:14:55,177 [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-22 01:14:55,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-22 01:14:55,999 [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-22 01:14:56,000 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-22 01:14:56,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-22 01:14:56,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-22 01:14:57,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-22 01:14:57,851 [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-22 01:14:58,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-22 01:14:58,800 [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-22 01:14:58,801 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-22 01:14:58,801 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:14:58,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-22 01:14:58,801 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:14:58,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:14:58,807 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:14:58,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:14:58,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:14:58,818 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:14:58,824 [ scc.git] DEBUG Already up to date.
2025-01-22 01:14:58,824 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-22 01:14:59,638 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-22 01:14:59,638 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-22 01:14:59,642 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-22 01:15:00,175 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-22 01:15:00,176 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-22 01:15:00,180 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:00,180 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:00,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:00,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-22 01:15:00,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:00,211 [ 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-22 01:15:00,333 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-22 01:15:00,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-22 01:15:00,333 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-22 01:15:00,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-22 01:15:00,334 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:00,334 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:00,340 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-22 01:15:00,348 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-22 01:15:00,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:00,482 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-22 01:15:00,499 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-22 01:15:00,507 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-22 01:15:00,514 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:00,514 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-22 01:15:00,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-22 01:15:00,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:00,532 [ 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-22 01:15:00,586 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-22 01:15:00,587 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-22 01:15:00,587 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-22 01:15:00,587 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:00,587 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:00,593 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-22 01:15:00,601 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-22 01:15:00,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:00,859 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-22 01:15:00,866 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-22 01:15:00,872 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/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-22 01:15:00,878 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:00,878 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-22 01:15:00,878 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:00,920 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:00,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:00,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:00,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:00,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c2abb80> has no local changes
2025-01-22 01:15:00,971 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:00,981 [ scc.git] DEBUG [detached HEAD b3ddf14] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:00,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:00,981 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:01,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-22 01:15:01,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-01-22 01:15:01,890 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-22 01:15:02,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-22 01:15:02,856 [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-22 01:15:03,356 [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-22 01:15:03,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-22 01:15:04,394 [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-22 01:15:04,395 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-22 01:15:04,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-22 01:15:05,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-22 01:15:05,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-22 01:15:06,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-22 01:15:06,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-22 01:15:07,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-22 01:15:07,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-22 01:15:07,672 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:07,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-22 01:15:07,672 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:07,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:07,678 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:07,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:07,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:07,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:07,696 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:07,696 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-01-22 01:15:08,015 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-01-22 01:15:08,015 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-01-22 01:15:08,020 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:08,020 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:08,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-22 01:15:08,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,035 [ 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-22 01:15:08,045 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:15:08,048 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-01-22 01:15:08,048 [ scc.git] DEBUG package.json | 2 +-
2025-01-22 01:15:08,048 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-01-22 01:15:08,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:08,183 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:08,223 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:08,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,229 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:08,265 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:08,272 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c2a9f40> has no local changes
2025-01-22 01:15:08,273 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:08,281 [ scc.git] DEBUG [detached HEAD e0fe428] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:08,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:08,281 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-22 01:15:08,595 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:08,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-22 01:15:08,596 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:08,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:08,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:08,606 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:08,612 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:08,618 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:08,619 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:08,619 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:08,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,626 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:08,670 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:08,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:08,677 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:08,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:08,724 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c24e940> has no local changes
2025-01-22 01:15:08,724 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:08,733 [ scc.git] DEBUG [detached HEAD cd8afaf] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:08,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:08,733 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:09,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-22 01:15:09,016 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:09,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-22 01:15:09,016 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:09,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:09,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:09,027 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:09,027 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:09,032 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:09,037 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:09,038 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:09,038 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:09,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:09,043 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:09,090 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:09,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:09,096 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:09,136 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:09,142 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c2085e0> has no local changes
2025-01-22 01:15:09,142 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:09,151 [ scc.git] DEBUG [detached HEAD b67f725] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:09,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:09,152 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:09,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-22 01:15:10,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-22 01:15:10,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-22 01:15:10,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-22 01:15:11,443 [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-22 01:15:12,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-22 01:15:12,445 [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-22 01:15:12,446 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-22 01:15:12,446 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:12,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-22 01:15:12,446 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:12,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:12,451 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:12,456 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:12,456 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:12,461 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:12,466 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:12,466 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-22 01:15:12,935 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-22 01:15:12,935 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-22 01:15:12,941 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:12,941 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:12,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:12,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-22 01:15:12,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:12,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-22 01:15:13,128 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG Auto-merging setup.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-22 01:15:13,128 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:13,128 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:13,135 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-22 01:15:13,141 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-22 01:15:13,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:13,284 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-22 01:15:13,290 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-22 01:15:13,296 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2025-01-22 01:15:13,301 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:13,301 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-22 01:15:13,301 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:13,340 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:13,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:13,346 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:13,384 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:13,391 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c2087f0> has no local changes
2025-01-22 01:15:13,391 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:13,401 [ scc.git] DEBUG [detached HEAD 3c61a49] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:13,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:13,401 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:13,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-22 01:15:14,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-22 01:15:14,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-22 01:15:15,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-22 01:15:15,722 [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-22 01:15:16,290 [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-22 01:15:17,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-22 01:15:17,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-22 01:15:17,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-22 01:15:18,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-22 01:15:18,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-22 01:15:19,313 [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-22 01:15:19,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-22 01:15:20,238 [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-22 01:15:20,239 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-22 01:15:20,239 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:20,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-22 01:15:20,239 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:20,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:20,248 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:20,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:20,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:20,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:20,268 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:20,268 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-22 01:15:20,681 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-22 01:15:20,681 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-22 01:15:20,688 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:20,689 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:20,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:20,698 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-22 01:15:20,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:20,726 [ 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-22 01:15:20,748 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:15:20,752 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-22 01:15:20,752 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-22 01:15:20,752 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-22 01:15:20,754 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-22 01:15:20,755 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-22 01:15:20,756 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-22 01:15:20,756 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-22 01:15:20,756 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-22 01:15:20,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:20,890 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:20,933 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:20,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:20,941 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:20,986 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:20,994 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c208640> has no local changes
2025-01-22 01:15:20,995 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:21,008 [ scc.git] DEBUG [detached HEAD 024a9d8] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:21,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:21,008 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:21,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-22 01:15:21,300 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:21,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-22 01:15:21,300 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:21,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:21,307 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:21,312 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:21,312 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:21,318 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:21,324 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:21,324 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:21,324 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:21,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:21,329 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:21,367 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:21,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:21,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:21,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:21,418 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c23a4c0> has no local changes
2025-01-22 01:15:21,418 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:21,430 [ scc.git] DEBUG [detached HEAD cd960fe] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:21,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:21,431 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:21,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-22 01:15:22,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-22 01:15:22,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-22 01:15:23,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-22 01:15:23,749 [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-22 01:15:24,169 [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-22 01:15:24,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-22 01:15:25,094 [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-22 01:15:25,094 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-22 01:15:25,094 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:25,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-22 01:15:25,095 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:25,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:25,100 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:25,106 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:25,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:25,111 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:25,116 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:25,116 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-22 01:15:25,660 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-22 01:15:25,660 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-22 01:15:25,665 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:25,665 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:25,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:25,671 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-22 01:15:25,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:25,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-22 01:15:25,691 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:15:25,694 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-22 01:15:25,694 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-22 01:15:25,694 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-22 01:15:25,694 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-22 01:15:25,694 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-22 01:15:25,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:25,835 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:25,874 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:25,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:25,879 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:25,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:25,922 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c23a790> has no local changes
2025-01-22 01:15:25,923 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:25,931 [ scc.git] DEBUG [detached HEAD 4180a4e] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:25,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:25,931 [ scc.git] INFO Overriding base-branch from master to main
2025-01-22 01:15:25,931 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:26,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-22 01:15:26,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-22 01:15:27,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-22 01:15:27,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-22 01:15:28,338 [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-22 01:15:28,795 [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-22 01:15:29,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-22 01:15:29,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-22 01:15:30,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-22 01:15:30,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-22 01:15:31,106 [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-22 01:15:31,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-22 01:15:32,008 [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-22 01:15:32,009 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-22 01:15:32,009 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:32,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-22 01:15:32,009 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:32,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:32,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-22 01:15:32,020 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:32,020 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-22 01:15:32,026 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-22 01:15:32,032 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:32,032 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-22 01:15:32,369 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-22 01:15:32,369 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-22 01:15:32,374 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:32,374 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:32,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:32,380 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-22 01:15:32,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:32,392 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-22 01:15:32,465 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-22 01:15:32,465 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-22 01:15:32,465 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:32,465 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:32,471 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-22 01:15:32,477 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-22 01:15:32,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:32,625 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-22 01:15:32,632 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-22 01:15:32,638 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-22 01:15:32,642 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:32,643 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-22 01:15:32,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:32,682 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:32,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:32,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:32,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:32,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c1e0580> has no local changes
2025-01-22 01:15:32,736 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:32,744 [ scc.git] DEBUG [detached HEAD 883539c] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:32,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:32,745 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:33,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-22 01:15:33,043 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:33,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-22 01:15:33,043 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,049 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:33,055 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:33,055 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:33,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:33,067 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:33,067 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:33,067 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,072 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:33,112 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:33,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:33,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c1e04f0> has no local changes
2025-01-22 01:15:33,165 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:33,173 [ scc.git] DEBUG [detached HEAD 5e7c637] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:33,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:33,174 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:33,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-22 01:15:33,476 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:33,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-22 01:15:33,476 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,482 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:33,487 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:33,487 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:33,493 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:33,499 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:33,499 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:33,499 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,504 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:33,541 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:33,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:33,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:33,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:33,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c1f1bb0> has no local changes
2025-01-22 01:15:33,591 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:33,599 [ scc.git] DEBUG [detached HEAD 7f06ecb] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:33,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:33,600 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:33,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-22 01:15:34,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-22 01:15:34,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-22 01:15:35,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-22 01:15:35,866 [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-22 01:15:36,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-22 01:15:36,780 [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-22 01:15:36,780 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-22 01:15:36,780 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:36,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-22 01:15:36,780 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:36,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:36,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-22 01:15:36,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:36,791 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-22 01:15:36,795 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-22 01:15:36,800 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:36,801 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-22 01:15:37,274 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-22 01:15:37,275 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-22 01:15:37,279 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:37,279 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:37,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:37,285 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-22 01:15:37,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:37,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-22 01:15:37,427 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-22 01:15:37,427 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-22 01:15:37,428 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:37,428 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:37,435 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-22 01:15:37,442 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-22 01:15:37,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:37,578 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-22 01:15:37,584 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-22 01:15:37,590 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-22 01:15:37,594 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:37,594 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-22 01:15:37,595 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:37,634 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:37,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:37,641 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:37,681 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:37,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c199a30> has no local changes
2025-01-22 01:15:37,688 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:37,697 [ scc.git] DEBUG [detached HEAD bdc5223] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:37,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:37,698 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-22 01:15:37,698 [ scc.repo] DEBUG ## PRs found:
2025-01-22 01:15:38,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-22 01:15:38,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-22 01:15:39,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-22 01:15:39,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-22 01:15:39,997 [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-22 01:15:40,437 [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-22 01:15:40,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-22 01:15:41,327 [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-22 01:15:41,328 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-22 01:15:41,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-22 01:15:42,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-22 01:15:42,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-22 01:15:43,176 [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-22 01:15:43,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-22 01:15:44,008 [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-22 01:15:44,008 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-22 01:15:44,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-22 01:15:44,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-22 01:15:45,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-22 01:15:45,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-22 01:15:45,961 [ scc.repo] DEBUG ## Branches found:
2025-01-22 01:15:45,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-22 01:15:45,961 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:45,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:45,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-22 01:15:45,973 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-22 01:15:45,973 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-22 01:15:45,979 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-22 01:15:45,984 [ scc.git] DEBUG Already up to date.
2025-01-22 01:15:45,985 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-22 01:15:46,639 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-22 01:15:46,640 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-22 01:15:46,646 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-22 01:15:47,208 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-22 01:15:47,208 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-22 01:15:47,212 [ scc.git] DEBUG ## Unique users: []
2025-01-22 01:15:47,213 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:47,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:47,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-22 01:15:47,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:47,231 [ 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-22 01:15:47,257 [ 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-22 01:15:47,257 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-22 01:15:47,258 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-22 01:15:47,264 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-22 01:15:47,270 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-22 01:15:47,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:47,404 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-22 01:15:47,412 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-22 01:15:47,419 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#313](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-22 01:15:47,424 [ scc.config] DEBUG Found github.token
2025-01-22 01:15:47,424 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-22 01:15:47,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-22 01:15:47,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:47,435 [ 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-22 01:15:47,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-22 01:15:47,449 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-22 01:15:47,449 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-22 01:15:47,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:47,790 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-22 01:15:47,831 [ scc.git] DEBUG Get sha1 of %s
2025-01-22 01:15:47,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-22 01:15:47,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:47,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:47,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85c199670> has no local changes
2025-01-22 01:15:47,885 [ 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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:47,894 [ scc.git] DEBUG [detached HEAD 51501eb] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:47,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:47,894 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-22 01:15:47,972 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-22 01:15:48,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:48,181 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-22 01:15:48,186 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-22 01:15:48,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:48,570 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-22 01:15:48,574 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-22 01:15:48,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:48,942 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-22 01:15:48,949 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-22 01:15:49,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:49,334 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-22 01:15:49,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:49,721 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-22 01:15:49,726 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-22 01:15:50,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:50,102 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-22 01:15:50,106 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-22 01:15:50,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:50,478 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-22 01:15:50,482 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-22 01:15:50,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:50,860 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-22 01:15:50,864 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-22 01:15:51,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:51,262 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-22 01:15:51,268 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-22 01:15:51,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:51,641 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-22 01:15:51,647 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-22 01:15:52,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:52,041 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-22 01:15:52,047 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-22 01:15:52,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:52,428 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-22 01:15:52,433 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-22 01:15:52,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:52,814 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-22 01:15:53,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:53,202 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-22 01:15:53,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:53,582 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-22 01:15:53,591 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-22 01:15:53,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:53,968 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-22 01:15:54,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:54,375 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-22 01:15:54,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:54,749 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-22 01:15:54,754 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-22 01:15:55,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:55,127 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-22 01:15:55,132 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-22 01:15:55,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:55,518 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-22 01:15:55,524 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-22 01:15:55,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:55,900 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-22 01:15:55,907 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-22 01:15:56,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-22 01:15:56,289 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-22 01:15:56,290 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-22 01:15:56,378 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff85ebe5be0> has local changes
2025-01-22 01:15:56,378 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
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#313 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/313/)'
2025-01-22 01:15:56,393 [ scc.git] DEBUG [detached HEAD 47cdf80] merge master -Dorg -Ssuccess-only
2025-01-22 01:15:56,393 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-22 01:15:56,394 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-22 01:15:56,394 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,394 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-22 01:15:56,394 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-22 01:15:56,394 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-22 01:15:56,394 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,394 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-22 01:15:56,394 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-22 01:15:56,394 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,394 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-22 01:15:56,394 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,394 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-22 01:15:56,394 [ scc.merge] INFO
2025-01-22 01:15:56,394 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-22 01:15:56,395 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-22 01:15:56,395 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-22 01:15:56,395 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-22 01:15:56,395 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-22 01:15:56,395 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-22 01:15:56,395 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-22 01:15:56,395 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-22 01:15:56,395 [ scc.merge] INFO
2025-01-22 01:15:56,395 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-22 01:15:56,396 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-22 01:15:56,396 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-22 01:15:56,396 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-22 01:15:56,396 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-22 01:15:56,396 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-22 01:15:56,396 [ scc.merge] INFO
2025-01-22 01:15:56,396 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-22 01:15:56,396 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-22 01:15:56,396 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-22 01:15:56,397 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,397 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,397 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-22 01:15:56,397 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,397 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-22 01:15:56,398 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-22 01:15:56,398 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-22 01:15:56,398 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-22 01:15:56,398 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-22 01:15:56,398 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Repository: ome/scripts
2025-01-22 01:15:56,398 [ scc.merge] INFO Excluded PRs:
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-22 01:15:56,398 [ scc.merge] INFO Already up to date.
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Merged PRs:
2025-01-22 01:15:56,398 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-22 01:15:56,398 [ scc.merge] INFO
2025-01-22 01:15:56,398 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-22 01:15:56,399 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-22 01:15:56,399 [ scc.merge] INFO
2025-01-22 01:15:56,399 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-22 01:15:56,399 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-22 01:15:56,405 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-22 01:15:56,411 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-22 01:15:56,418 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-22 01:15:56,423 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-22 01:15:56,428 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-22 01:15:56,434 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-22 01:15:56,439 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-22 01:15:56,444 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-22 01:15:56,449 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-22 01:15:56,454 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-22 01:15:56,459 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-22 01:15:56,464 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-22 01:15:56,469 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-22 01:15:56,474 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-22 01:15:56,478 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-22 01:15:56,484 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-22 01:15:56,489 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-22 01:15:56,494 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-22 01:15:56,499 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-22 01:15:56,504 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-22 01:15:56,508 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-22 01:15:56,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-22 01:15:56,513 [ scc.git] DEBUG Calling 'git remote'
2025-01-22 01:15:56,518 [ 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 26b4b8f] 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 f75542d] 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-22 01:16:41,329 [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-22 01:16:49,971 [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-22 01:16:52,259 [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-22 01:16:56,771 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-22 01:17:36,126 [ 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}
