Skipping 114 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-27 01:15:19,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:19,561 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:15:19,565 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:15:19,566 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:15:19,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:15:19,576 [ scc.git] DEBUG Already up to date.
2025-01-27 01:15:19,576 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-27 01:15:20,049 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-27 01:15:20,049 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-27 01:15:20,054 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:15:20,054 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:15:20,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:20,061 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-27 01:15:20,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:20,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-27 01:15:20,082 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-27 01:15:20,084 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:15:20,087 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-27 01:15:20,087 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-27 01:15:20,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:20,226 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:15:20,276 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:15:20,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:20,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:15:20,323 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:15:20,330 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e932d4f0> has no local changes
2025-01-27 01:15:20,330 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:15:20,339 [ scc.git] DEBUG [detached HEAD 116aabd] merge master -Dorg -Ssuccess-only
2025-01-27 01:15:20,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:15:20,339 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:15:20,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-27 01:15:21,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-27 01:15:21,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-27 01:15:22,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-27 01:15:22,177 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:22,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-27 01:15:23,203 [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-27 01:15:23,703 [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-27 01:15:24,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-27 01:15:24,650 [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-27 01:15:24,651 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-27 01:15:25,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-27 01:15:25,121 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:25,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-27 01:15:26,198 [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-27 01:15:27,101 [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-27 01:15:27,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-27 01:15:27,940 [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-27 01:15:27,941 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-27 01:15:28,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-27 01:15:28,389 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:28,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-27 01:15:29,436 [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-27 01:15:29,907 [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-27 01:15:30,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-27 01:15:30,858 [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-27 01:15:30,859 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-27 01:15:31,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-27 01:15:31,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-27 01:15:31,744 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:32,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-27 01:15:32,807 [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-27 01:15:33,326 [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-27 01:15:33,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-27 01:15:34,138 [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-27 01:15:34,139 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-27 01:15:34,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-27 01:15:34,595 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:35,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-27 01:15:35,632 [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-27 01:15:36,097 [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-27 01:15:36,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-27 01:15:37,032 [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-27 01:15:37,033 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-27 01:15:37,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-27 01:15:37,484 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:38,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-27 01:15:38,586 [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-27 01:15:39,076 [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-27 01:15:39,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-27 01:15:40,010 [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-27 01:15:40,010 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-27 01:15:40,011 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:15:40,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-27 01:15:40,011 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:15:40,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:40,017 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:15:40,023 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:15:40,023 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:15:40,029 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:15:40,036 [ scc.git] DEBUG Already up to date.
2025-01-27 01:15:40,036 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-27 01:15:40,410 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:40,410 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-27 01:15:40,416 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-27 01:15:40,696 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:40,697 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-27 01:15:40,702 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-27 01:15:41,010 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:41,010 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-27 01:15:41,016 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-27 01:15:41,300 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:41,300 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-27 01:15:41,305 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-27 01:15:41,587 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:41,587 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-27 01:15:41,593 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-27 01:15:41,874 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-27 01:15:41,874 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-27 01:15:41,881 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:15:41,881 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:15:41,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:41,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-27 01:15:41,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:41,953 [ 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-27 01:15:41,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:15:41,970 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-27 01:15:41,970 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-27 01:15:42,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:42,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-27 01:15:42,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:42,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-27 01:15:42,224 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-27 01:15:42,224 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:15:42,230 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-27 01:15:42,230 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-27 01:15:42,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:42,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-27 01:15:42,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:42,563 [ 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-27 01:15:42,695 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-27 01:15:42,695 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-27 01:15:42,695 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:15:42,696 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:15:42,702 [ scc.git] DEBUG Calling 'git reset --hard 1b3fddfece340e6b398da6abe2349b3e081f6bd9'
2025-01-27 01:15:42,709 [ scc.git] DEBUG HEAD is now at 1b3fddf merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-27 01:15:42,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:42,913 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-27 01:15:42,920 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-27 01:15:42,927 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/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-27 01:15:42,934 [ scc.config] DEBUG Found github.token
2025-01-27 01:15:42,934 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-27 01:15:42,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-27 01:15:42,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:42,946 [ 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-27 01:15:42,975 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-27 01:15:42,996 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:15:43,001 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-27 01:15:43,001 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-27 01:15:43,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:43,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-27 01:15:43,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:43,315 [ 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-27 01:15:43,336 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-27 01:15:43,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:15:43,341 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-27 01:15:43,341 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-27 01:15:43,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:43,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-27 01:15:43,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:43,721 [ 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-27 01:15:43,840 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-27 01:15:43,841 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-27 01:15:43,841 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:15:43,841 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:15:43,848 [ scc.git] DEBUG Calling 'git reset --hard 3387f335394c8ccecca1f22290bb796bd1e7f57d'
2025-01-27 01:15:43,859 [ scc.git] DEBUG HEAD is now at 3387f33 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-27 01:15:44,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:15:44,051 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-27 01:15:44,058 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-27 01:15:44,063 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/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-27 01:15:44,068 [ scc.config] DEBUG Found github.token
2025-01-27 01:15:44,069 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-27 01:15:44,069 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:15:44,111 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:15:44,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:15:44,117 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:15:44,157 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:15:44,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e9305b80> has no local changes
2025-01-27 01:15:44,165 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:15:44,175 [ scc.git] DEBUG [detached HEAD a7b9205] merge master -Dorg -Ssuccess-only
2025-01-27 01:15:44,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:15:44,175 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:15:44,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-27 01:15:45,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-27 01:15:45,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-27 01:15:46,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-27 01:15:46,503 [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-27 01:15:46,969 [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-27 01:15:47,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-27 01:15:47,777 [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-27 01:15:47,777 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-27 01:15:48,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-27 01:15:48,236 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:15:48,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-27 01:15:49,450 [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-27 01:15:49,912 [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-27 01:15:50,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-27 01:15:50,845 [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-27 01:15:50,847 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-27 01:15:51,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-27 01:15:51,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-27 01:15:52,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-27 01:15:52,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-27 01:15:53,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-27 01:15:53,599 [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-27 01:15:54,042 [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-27 01:15:54,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-27 01:15:55,035 [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-27 01:15:55,036 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-27 01:15:55,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-27 01:15:55,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-27 01:15:56,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-27 01:15:56,898 [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-27 01:15:57,383 [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-27 01:15:57,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-27 01:15:58,281 [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-27 01:15:58,282 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-27 01:15:58,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-27 01:15:59,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-27 01:15:59,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-27 01:16:00,091 [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-27 01:16:00,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-27 01:16:00,977 [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-27 01:16:00,977 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-27 01:16:00,978 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:00,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-27 01:16:00,978 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:00,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:00,985 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:00,989 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:00,990 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:00,995 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:01,000 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:01,001 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-27 01:16:01,426 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-27 01:16:01,426 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-27 01:16:01,431 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-27 01:16:03,244 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-27 01:16:03,245 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-27 01:16:03,250 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-27 01:16:04,028 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-27 01:16:04,028 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-27 01:16:04,034 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-27 01:16:04,332 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-27 01:16:04,332 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-27 01:16:04,337 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-27 01:16:05,523 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-27 01:16:05,523 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-27 01:16:05,528 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:05,529 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:05,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:05,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-27 01:16:05,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:05,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-27 01:16:05,562 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-27 01:16:05,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:05,567 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-27 01:16:05,567 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-27 01:16:05,567 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-27 01:16:05,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:05,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-27 01:16:05,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:05,747 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-27 01:16:06,275 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-27 01:16:06,275 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-27 01:16:06,275 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-27 01:16:06,275 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-27 01:16:06,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:06,280 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-27 01:16:06,280 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-27 01:16:06,281 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-27 01:16:06,281 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-27 01:16:06,281 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-27 01:16:06,281 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-27 01:16:06,281 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-27 01:16:06,281 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-27 01:16:06,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:06,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-27 01:16:06,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:06,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-27 01:16:06,648 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-27 01:16:06,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:06,652 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-27 01:16:06,652 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-27 01:16:06,652 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-27 01:16:06,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:06,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-27 01:16:06,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:06,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-27 01:16:06,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:06,983 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-27 01:16:06,983 [ scc.git] DEBUG package.json | 2 +-
2025-01-27 01:16:06,983 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-27 01:16:07,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:07,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-27 01:16:07,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:07,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-27 01:16:07,325 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-27 01:16:07,326 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-27 01:16:07,326 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-27 01:16:07,326 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-27 01:16:07,326 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-27 01:16:07,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:07,377 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-27 01:16:07,377 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-27 01:16:07,377 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-27 01:16:07,377 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-27 01:16:07,377 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-27 01:16:07,377 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-27 01:16:07,377 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-27 01:16:07,377 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-27 01:16:07,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:07,619 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:07,659 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:07,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:07,666 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:07,707 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:07,715 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e92ee5e0> has no local changes
2025-01-27 01:16:07,715 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:07,726 [ scc.git] DEBUG [detached HEAD adfe754] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:07,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:07,726 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:08,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-27 01:16:08,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-27 01:16:09,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-27 01:16:09,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-27 01:16:09,980 [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-27 01:16:10,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-27 01:16:10,827 [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-27 01:16:10,827 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-27 01:16:10,827 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:10,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-27 01:16:10,828 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:10,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:10,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:10,839 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:10,839 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:10,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:10,851 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:10,852 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-27 01:16:11,182 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-27 01:16:11,182 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-27 01:16:11,187 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:11,187 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:11,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:11,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-27 01:16:11,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:11,206 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-27 01:16:11,216 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:11,220 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-27 01:16:11,220 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-27 01:16:11,220 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-27 01:16:11,220 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-27 01:16:11,220 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-27 01:16:11,220 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-27 01:16:11,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:11,361 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:11,402 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:11,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:11,408 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:11,451 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:11,460 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e82995b0> has no local changes
2025-01-27 01:16:11,460 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:11,776 [ scc.git] DEBUG [detached HEAD d53910d] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:11,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:11,777 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:12,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-27 01:16:12,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-27 01:16:12,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-27 01:16:13,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-27 01:16:13,870 [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-27 01:16:14,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-27 01:16:14,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-27 01:16:14,858 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-27 01:16:15,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-27 01:16:15,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-27 01:16:16,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-27 01:16:16,691 [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-27 01:16:17,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-27 01:16:17,533 [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-27 01:16:17,534 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-27 01:16:17,534 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:17,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-27 01:16:17,535 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:17,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:17,541 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:17,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:17,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:17,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:17,560 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:17,560 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-27 01:16:18,442 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-27 01:16:18,442 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-27 01:16:18,448 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-27 01:16:19,022 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-27 01:16:19,022 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-27 01:16:19,027 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:19,027 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:19,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:19,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-27 01:16:19,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:19,047 [ 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-27 01:16:19,154 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-27 01:16:19,154 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-27 01:16:19,154 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-27 01:16:19,154 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-27 01:16:19,156 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:16:19,156 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:16:19,163 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-27 01:16:19,171 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-27 01:16:19,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:19,300 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-27 01:16:19,308 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-27 01:16:19,391 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-27 01:16:19,398 [ scc.config] DEBUG Found github.token
2025-01-27 01:16:19,398 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-27 01:16:19,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-27 01:16:19,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:19,411 [ 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-27 01:16:19,518 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-27 01:16:19,518 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-27 01:16:19,518 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-27 01:16:19,519 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:16:19,519 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:16:19,526 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-27 01:16:19,534 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-27 01:16:19,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:19,694 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-27 01:16:19,703 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-27 01:16:19,710 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/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-27 01:16:19,716 [ scc.config] DEBUG Found github.token
2025-01-27 01:16:19,716 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-27 01:16:19,716 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:19,761 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:19,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:19,768 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:19,811 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:19,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e82adb80> has no local changes
2025-01-27 01:16:19,819 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:19,829 [ scc.git] DEBUG [detached HEAD 3eca957] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:19,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:19,829 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:20,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-27 01:16:20,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-01-27 01:16:20,703 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-27 01:16:21,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-27 01:16:21,765 [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-27 01:16:22,264 [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-27 01:16:22,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-27 01:16:23,161 [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-27 01:16:23,163 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-27 01:16:23,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-27 01:16:24,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-27 01:16:24,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-27 01:16:24,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-27 01:16:25,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-27 01:16:25,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-27 01:16:26,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-27 01:16:26,439 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:26,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-27 01:16:26,439 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:26,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:26,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:26,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:26,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:26,458 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:26,463 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:26,464 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-01-27 01:16:26,781 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-01-27 01:16:26,781 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-01-27 01:16:26,785 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:26,785 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:26,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:26,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-27 01:16:26,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:26,803 [ 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-27 01:16:26,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:26,836 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-01-27 01:16:26,836 [ scc.git] DEBUG package.json | 2 +-
2025-01-27 01:16:26,836 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-01-27 01:16:26,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:26,973 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:27,013 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:27,055 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:27,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e82a6f40> has no local changes
2025-01-27 01:16:27,062 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:27,119 [ scc.git] DEBUG [detached HEAD 2817a63] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:27,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:27,120 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:27,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-27 01:16:27,389 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:27,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-27 01:16:27,389 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,396 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:27,401 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:27,401 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:27,406 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:27,412 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:27,412 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:27,412 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,417 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:27,457 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:27,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:27,506 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e824f940> has no local changes
2025-01-27 01:16:27,506 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:27,514 [ scc.git] DEBUG [detached HEAD 0510398] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:27,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:27,515 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:27,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-27 01:16:27,814 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:27,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-27 01:16:27,814 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,821 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:27,827 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:27,827 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:27,833 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:27,838 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:27,838 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:27,838 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,843 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:27,882 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:27,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:27,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:27,931 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:27,937 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e82095e0> has no local changes
2025-01-27 01:16:27,937 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:27,945 [ scc.git] DEBUG [detached HEAD 9e138b4] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:27,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:27,946 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:28,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-27 01:16:28,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-27 01:16:29,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-27 01:16:29,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-27 01:16:30,155 [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-27 01:16:30,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-27 01:16:31,081 [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-27 01:16:31,082 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-27 01:16:31,082 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:31,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-27 01:16:31,082 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:31,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:31,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:31,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:31,093 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:31,099 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:31,104 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:31,104 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-27 01:16:31,596 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-27 01:16:31,596 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-27 01:16:31,601 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:31,601 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:31,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:31,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-27 01:16:31,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:31,618 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-27 01:16:31,838 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-27 01:16:31,838 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-27 01:16:31,838 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-27 01:16:31,838 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-27 01:16:31,839 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-27 01:16:31,839 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-27 01:16:31,839 [ scc.git] DEBUG Auto-merging setup.py
2025-01-27 01:16:31,839 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-27 01:16:31,839 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:16:31,839 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:16:31,847 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-27 01:16:31,855 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-27 01:16:31,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:32,000 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-27 01:16:32,006 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-27 01:16:32,110 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-01-27 01:16:32,116 [ scc.config] DEBUG Found github.token
2025-01-27 01:16:32,116 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-27 01:16:32,116 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:32,157 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:32,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:32,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:32,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:32,214 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e82097f0> has no local changes
2025-01-27 01:16:32,214 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:32,224 [ scc.git] DEBUG [detached HEAD 5912333] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:32,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:32,225 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:32,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-27 01:16:32,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-27 01:16:33,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-27 01:16:33,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-27 01:16:34,387 [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-27 01:16:34,824 [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-27 01:16:35,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-27 01:16:35,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-27 01:16:36,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-27 01:16:36,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-27 01:16:37,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-27 01:16:37,507 [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-27 01:16:37,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-27 01:16:38,383 [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-27 01:16:38,384 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-27 01:16:38,384 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:38,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-27 01:16:38,384 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:38,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:38,392 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:38,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:38,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:38,404 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:38,410 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:38,410 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-27 01:16:38,862 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-27 01:16:38,863 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-27 01:16:38,868 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:38,868 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:38,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:38,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-27 01:16:38,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:38,888 [ 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-27 01:16:38,907 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-27 01:16:38,910 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-27 01:16:38,913 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-27 01:16:38,913 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-27 01:16:38,913 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-27 01:16:38,914 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-27 01:16:39,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:39,071 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:39,113 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:39,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:39,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:39,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:39,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e8209640> has no local changes
2025-01-27 01:16:39,166 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:39,231 [ scc.git] DEBUG [detached HEAD db79e62] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:39,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:39,232 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:39,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-27 01:16:39,483 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:39,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-27 01:16:39,483 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:39,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:39,490 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:39,494 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:39,494 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:39,517 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:39,527 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:39,528 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:39,528 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:39,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:39,534 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:39,574 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:39,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:39,579 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:39,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:39,626 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e826c550> has no local changes
2025-01-27 01:16:39,626 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:39,634 [ scc.git] DEBUG [detached HEAD 93d906f] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:39,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:39,634 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:39,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-27 01:16:40,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-27 01:16:40,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-27 01:16:41,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-27 01:16:41,805 [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-27 01:16:42,255 [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-27 01:16:42,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-27 01:16:43,132 [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-27 01:16:43,133 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-27 01:16:43,133 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:43,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-27 01:16:43,133 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:43,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:43,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:43,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:43,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:43,149 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:43,155 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:43,155 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-27 01:16:43,530 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-27 01:16:43,530 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-27 01:16:43,535 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:43,535 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:43,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:43,541 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-27 01:16:43,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:43,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-27 01:16:43,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:16:43,574 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-27 01:16:43,574 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-27 01:16:43,574 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-27 01:16:43,574 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-27 01:16:43,574 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-27 01:16:43,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:43,706 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:43,748 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:43,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:43,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:43,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:43,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e826c790> has no local changes
2025-01-27 01:16:43,802 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:43,811 [ scc.git] DEBUG [detached HEAD bd2dc02] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:43,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:43,812 [ scc.git] INFO Overriding base-branch from master to main
2025-01-27 01:16:43,812 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:44,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-27 01:16:44,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-27 01:16:45,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-27 01:16:45,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-27 01:16:46,112 [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-27 01:16:46,568 [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-27 01:16:47,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-27 01:16:47,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-27 01:16:47,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-27 01:16:48,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-27 01:16:48,836 [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-27 01:16:49,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-27 01:16:49,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-27 01:16:49,704 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-27 01:16:49,705 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:49,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-27 01:16:49,705 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:49,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:49,713 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-27 01:16:49,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:49,718 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-27 01:16:49,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-27 01:16:49,731 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:49,731 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-27 01:16:50,027 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-27 01:16:50,028 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-27 01:16:50,031 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:50,032 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:50,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:50,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-27 01:16:50,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:50,047 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-27 01:16:50,442 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-27 01:16:50,442 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-27 01:16:50,442 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:16:50,443 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:16:50,449 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-27 01:16:50,456 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-27 01:16:50,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:50,595 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-27 01:16:50,601 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-27 01:16:50,607 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-27 01:16:50,611 [ scc.config] DEBUG Found github.token
2025-01-27 01:16:50,611 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-27 01:16:50,612 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:50,653 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:50,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:50,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:50,698 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:50,705 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e81e1580> has no local changes
2025-01-27 01:16:50,705 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:50,713 [ scc.git] DEBUG [detached HEAD 5f23375] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:50,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:50,713 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:50,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-27 01:16:50,992 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:50,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-27 01:16:50,992 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:50,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:50,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:51,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:51,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:51,010 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:51,016 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:51,016 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:51,016 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:51,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:51,021 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:51,060 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:51,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:51,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:51,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:51,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e81e14f0> has no local changes
2025-01-27 01:16:51,113 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:51,120 [ scc.git] DEBUG [detached HEAD 3630272] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:51,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:51,121 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:51,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-27 01:16:51,385 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:51,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-27 01:16:51,385 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:51,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:51,391 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:51,396 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:51,396 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:51,401 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:51,408 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:51,408 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:51,408 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:51,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:51,414 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:51,453 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:51,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:51,459 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:51,495 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:51,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e81f2bb0> has no local changes
2025-01-27 01:16:51,501 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:51,509 [ scc.git] DEBUG [detached HEAD ed57e02] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:51,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:51,509 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:51,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-27 01:16:52,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-27 01:16:52,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-27 01:16:53,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-27 01:16:53,743 [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-27 01:16:54,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-27 01:16:54,651 [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-27 01:16:54,652 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-27 01:16:54,652 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:16:54,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-27 01:16:54,652 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:54,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:54,658 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-27 01:16:54,664 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:16:54,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-27 01:16:54,669 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-27 01:16:54,675 [ scc.git] DEBUG Already up to date.
2025-01-27 01:16:54,676 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-27 01:16:55,025 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-27 01:16:55,025 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-27 01:16:55,030 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:16:55,030 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:55,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:55,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-27 01:16:55,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:55,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-27 01:16:55,210 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-27 01:16:55,210 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-27 01:16:55,210 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:16:55,211 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:16:55,221 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-27 01:16:55,233 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-27 01:16:55,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:16:55,374 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-27 01:16:55,382 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-27 01:16:55,387 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-27 01:16:55,392 [ scc.config] DEBUG Found github.token
2025-01-27 01:16:55,393 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-27 01:16:55,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:16:55,437 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:16:55,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:16:55,443 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:16:55,482 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:16:55,490 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e8199a30> has no local changes
2025-01-27 01:16:55,490 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:16:55,498 [ scc.git] DEBUG [detached HEAD 4431166] merge master -Dorg -Ssuccess-only
2025-01-27 01:16:55,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:16:55,499 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-27 01:16:55,499 [ scc.repo] DEBUG ## PRs found:
2025-01-27 01:16:55,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-27 01:16:56,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-27 01:16:56,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-27 01:16:57,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-27 01:16:57,789 [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-27 01:16:58,242 [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-27 01:16:58,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-27 01:16:59,347 [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-27 01:16:59,348 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-27 01:16:59,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-27 01:17:00,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-27 01:17:00,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-27 01:17:01,136 [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-27 01:17:01,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-27 01:17:02,020 [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-27 01:17:02,021 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-27 01:17:02,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-27 01:17:02,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-27 01:17:03,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-27 01:17:03,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-27 01:17:03,862 [ scc.repo] DEBUG ## Branches found:
2025-01-27 01:17:03,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-27 01:17:03,862 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:17:03,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:17:03,869 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-27 01:17:03,875 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-27 01:17:03,875 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-27 01:17:03,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-27 01:17:03,886 [ scc.git] DEBUG Already up to date.
2025-01-27 01:17:03,886 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-27 01:17:04,482 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-27 01:17:04,482 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-27 01:17:04,489 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-27 01:17:05,197 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-27 01:17:05,197 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-27 01:17:05,202 [ scc.git] DEBUG ## Unique users: []
2025-01-27 01:17:05,202 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:17:05,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:17:05,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-27 01:17:05,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:17:05,222 [ 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-27 01:17:05,255 [ 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-27 01:17:05,255 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-27 01:17:05,256 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-27 01:17:05,262 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-27 01:17:05,269 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-27 01:17:05,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:05,397 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-27 01:17:05,406 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-27 01:17:05,413 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#317](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-27 01:17:05,418 [ scc.config] DEBUG Found github.token
2025-01-27 01:17:05,419 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-27 01:17:05,419 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-27 01:17:05,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:17:05,431 [ 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-27 01:17:05,468 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-27 01:17:05,471 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-27 01:17:05,471 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-27 01:17:05,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:05,789 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-27 01:17:05,827 [ scc.git] DEBUG Get sha1 of %s
2025-01-27 01:17:05,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-27 01:17:05,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:17:05,871 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:17:05,877 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2e8199670> has no local changes
2025-01-27 01:17:05,878 [ 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#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:17:05,940 [ scc.git] DEBUG [detached HEAD 282a03d] merge master -Dorg -Ssuccess-only
2025-01-27 01:17:05,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:05,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-27 01:17:06,015 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-27 01:17:06,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:06,204 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-27 01:17:06,209 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-27 01:17:06,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:06,587 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-27 01:17:06,593 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-27 01:17:06,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:06,989 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-27 01:17:06,994 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-27 01:17:07,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:07,381 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-27 01:17:07,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:07,768 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-27 01:17:07,773 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-27 01:17:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:08,152 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-27 01:17:08,157 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-27 01:17:08,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:08,534 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-27 01:17:08,539 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-27 01:17:08,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:08,914 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-27 01:17:08,919 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-27 01:17:09,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:09,312 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-27 01:17:09,316 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-27 01:17:09,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:09,697 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-27 01:17:09,701 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-27 01:17:10,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:10,079 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-27 01:17:10,084 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-27 01:17:10,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:10,461 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-27 01:17:10,466 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-27 01:17:10,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:10,856 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-27 01:17:11,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:11,249 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-27 01:17:11,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:11,643 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-27 01:17:11,648 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-27 01:17:12,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:12,043 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-27 01:17:12,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:12,423 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-27 01:17:12,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:12,823 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-27 01:17:12,829 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-27 01:17:13,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:13,227 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-27 01:17:13,231 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-27 01:17:13,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:13,602 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-27 01:17:13,607 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-27 01:17:13,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:13,981 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-27 01:17:13,985 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-27 01:17:14,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-27 01:17:14,394 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-27 01:17:14,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-27 01:17:14,473 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd2ea3e5ac0> has local changes
2025-01-27 01:17:14,473 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
- PR 610 will-moore 'Add docs/contributing.rst'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#317 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/317/)'
2025-01-27 01:17:14,487 [ scc.git] DEBUG [detached HEAD f4a1d14] merge master -Dorg -Ssuccess-only
2025-01-27 01:17:14,488 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-27 01:17:14,488 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-27 01:17:14,488 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,488 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-27 01:17:14,488 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-27 01:17:14,488 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-27 01:17:14,488 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,488 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-27 01:17:14,488 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-27 01:17:14,488 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,488 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-27 01:17:14,488 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,488 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-27 01:17:14,488 [ scc.merge] INFO
2025-01-27 01:17:14,488 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-27 01:17:14,489 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-27 01:17:14,489 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-27 01:17:14,489 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-27 01:17:14,489 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-27 01:17:14,489 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-27 01:17:14,489 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,489 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-27 01:17:14,489 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-27 01:17:14,489 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-27 01:17:14,490 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-27 01:17:14,490 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-27 01:17:14,490 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-27 01:17:14,490 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-27 01:17:14,490 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-27 01:17:14,490 [ scc.merge] INFO
2025-01-27 01:17:14,490 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-27 01:17:14,490 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-27 01:17:14,490 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-27 01:17:14,491 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-27 01:17:14,491 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,491 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,491 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-27 01:17:14,491 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-27 01:17:14,492 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-27 01:17:14,492 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-27 01:17:14,492 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-27 01:17:14,492 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-27 01:17:14,492 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Repository: ome/scripts
2025-01-27 01:17:14,492 [ scc.merge] INFO Excluded PRs:
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-27 01:17:14,492 [ scc.merge] INFO Already up to date.
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Merged PRs:
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-27 01:17:14,492 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-27 01:17:14,492 [ scc.merge] INFO
2025-01-27 01:17:14,492 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-27 01:17:14,493 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-27 01:17:14,498 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-27 01:17:14,503 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-27 01:17:14,507 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-27 01:17:14,513 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-27 01:17:14,518 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-27 01:17:14,524 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-27 01:17:14,531 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-27 01:17:14,535 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-27 01:17:14,540 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-27 01:17:14,545 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-27 01:17:14,549 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-27 01:17:14,554 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-27 01:17:14,559 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-27 01:17:14,563 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-27 01:17:14,568 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-27 01:17:14,573 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-27 01:17:14,577 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-27 01:17:14,582 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-27 01:17:14,587 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-27 01:17:14,591 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-27 01:17:14,596 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-27 01:17:14,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-27 01:17:14,601 [ scc.git] DEBUG Calling 'git remote'
2025-01-27 01:17:14,605 [ 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 1d46630] 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 c42a8e4] 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-27 01:18:01,358 [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-27 01:18:10,154 [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-27 01:18:12,447 [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-27 01:18:16,912 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-27 01:18:55,587 [ 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}
