Skipping 122 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-02-10 00:44:23,652 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:44:23,659 [ scc.git] DEBUG Already up to date.
2025-02-10 00:44:23,660 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-02-10 00:44:23,993 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-02-10 00:44:23,995 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-02-10 00:44:24,003 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:44:24,003 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:44:24,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:24,010 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-02-10 00:44:24,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:24,024 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-02-10 00:44:24,097 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-02-10 00:44:24,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:44:24,102 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-02-10 00:44:24,102 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-02-10 00:44:24,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:24,269 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:44:24,329 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:44:24,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:24,336 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:44:24,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:44:24,394 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ed7259a0> has no local changes
2025-02-10 00:44:24,394 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:44:24,407 [ scc.git] DEBUG [detached HEAD d624003] merge master -Dorg -Ssuccess-only
2025-02-10 00:44:24,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:44:24,408 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:44:24,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-02-10 00:44:25,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-02-10 00:44:25,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-02-10 00:44:26,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-02-10 00:44:26,219 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:26,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-02-10 00:44:27,235 [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-02-10 00:44:27,709 [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-02-10 00:44:28,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-02-10 00:44:28,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:28,552 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-10 00:44:29,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-02-10 00:44:29,005 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:29,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-02-10 00:44:30,058 [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-02-10 00:44:30,598 [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-02-10 00:44:31,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-02-10 00:44:31,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:31,424 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-10 00:44:31,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-02-10 00:44:31,935 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:32,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-02-10 00:44:32,934 [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-02-10 00:44:33,414 [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-02-10 00:44:33,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-02-10 00:44:34,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:34,353 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-10 00:44:34,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-02-10 00:44:35,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-02-10 00:44:35,222 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:35,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-02-10 00:44:36,244 [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-02-10 00:44:36,698 [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-02-10 00:44:37,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-02-10 00:44:37,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:37,666 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-10 00:44:38,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-02-10 00:44:38,110 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:38,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-02-10 00:44:39,102 [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-02-10 00:44:39,573 [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-02-10 00:44:40,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-02-10 00:44:40,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:40,506 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-10 00:44:40,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-02-10 00:44:40,948 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:41,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-02-10 00:44:42,001 [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-02-10 00:44:42,497 [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-02-10 00:44:43,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-02-10 00:44:43,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:43,454 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-10 00:44:43,454 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:44:43,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-10 00:44:43,455 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:44:43,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:43,463 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:44:43,468 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:44:43,468 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:44:43,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:44:43,479 [ scc.git] DEBUG Already up to date.
2025-02-10 00:44:43,479 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-02-10 00:44:43,808 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:43,809 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-02-10 00:44:43,814 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-02-10 00:44:44,146 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:44,146 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-02-10 00:44:44,151 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-02-10 00:44:44,437 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:44,438 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-02-10 00:44:44,443 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-02-10 00:44:44,729 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:44,729 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-02-10 00:44:44,734 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-02-10 00:44:45,032 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:45,033 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-02-10 00:44:45,037 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-02-10 00:44:45,358 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-02-10 00:44:45,358 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-02-10 00:44:45,363 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:44:45,363 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:44:45,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:45,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-02-10 00:44:45,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:45,383 [ 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-02-10 00:44:45,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:44:45,401 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-02-10 00:44:45,401 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-02-10 00:44:45,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:45,542 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-02-10 00:44:45,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:45,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-02-10 00:44:45,573 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-10 00:44:45,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:44:45,578 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-02-10 00:44:45,579 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-02-10 00:44:45,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:45,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-02-10 00:44:45,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:45,995 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-02-10 00:44:46,082 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-10 00:44:46,082 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-10 00:44:46,082 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:44:46,083 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:44:46,089 [ scc.git] DEBUG Calling 'git reset --hard bb99a180af970efb5d7c94aa2c3462ad993617a6'
2025-02-10 00:44:46,096 [ scc.git] DEBUG HEAD is now at bb99a18 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-02-10 00:44:46,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:46,340 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-02-10 00:44:46,347 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-02-10 00:44:46,353 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/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-02-10 00:44:46,358 [ scc.config] DEBUG Found github.token
2025-02-10 00:44:46,358 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-02-10 00:44:46,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-02-10 00:44:46,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:46,368 [ 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-02-10 00:44:46,443 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-10 00:44:46,444 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:44:46,449 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-02-10 00:44:46,449 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-02-10 00:44:46,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:46,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-02-10 00:44:46,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:46,740 [ 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-02-10 00:44:46,770 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-10 00:44:46,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:44:46,775 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-02-10 00:44:46,775 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-02-10 00:44:47,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:47,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-10 00:44:47,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:47,157 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-10 00:44:47,267 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-10 00:44:47,267 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-10 00:44:47,268 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:44:47,268 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:44:47,274 [ scc.git] DEBUG Calling 'git reset --hard 71432e8c38195c044a9db7c2959e4371c61d78ca'
2025-02-10 00:44:47,281 [ scc.git] DEBUG HEAD is now at 71432e8 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-02-10 00:44:47,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:44:47,486 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-02-10 00:44:47,492 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-02-10 00:44:47,498 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/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-02-10 00:44:47,504 [ scc.config] DEBUG Found github.token
2025-02-10 00:44:47,504 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-02-10 00:44:47,505 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:44:47,549 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:44:47,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:44:47,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:44:47,599 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:44:47,608 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ed718b20> has no local changes
2025-02-10 00:44:47,608 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:44:47,619 [ scc.git] DEBUG [detached HEAD 0e31e5d] merge master -Dorg -Ssuccess-only
2025-02-10 00:44:47,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:44:47,620 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:44:48,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-10 00:44:48,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/501 HTTP/1.1" 200 None
2025-02-10 00:44:49,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c5a64f9abf8c6b36b4abad33fb178df0658c6e37 HTTP/1.1" 200 None
2025-02-10 00:44:49,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c5a64f9abf8c6b36b4abad33fb178df0658c6e37/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-10 00:44:49,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c5a64f9abf8c6b36b4abad33fb178df0658c6e37/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-10 00:44:50,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c5a64f9abf8c6b36b4abad33fb178df0658c6e37 HTTP/1.1" 200 None
2025-02-10 00:44:50,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/c5a64f9abf8c6b36b4abad33fb178df0658c6e37?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:50,791 [ scc.repo] DEBUG - PR 501 will-moore 'Add docs/settings.md'
2025-02-10 00:44:51,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-10 00:44:51,241 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:44:51,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-10 00:44:52,272 [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-02-10 00:44:52,789 [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-02-10 00:44:53,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-10 00:44:53,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:53,828 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-10 00:44:54,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-10 00:44:54,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-10 00:44:55,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-10 00:44:55,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-10 00:44:56,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-10 00:44:56,605 [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-02-10 00:44:57,030 [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-02-10 00:44:57,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-10 00:44:57,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:44:57,916 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-10 00:44:58,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-10 00:44:58,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-10 00:44:59,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-10 00:44:59,783 [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-02-10 00:45:00,218 [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-02-10 00:45:00,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-10 00:45:01,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:01,105 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-10 00:45:01,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-10 00:45:02,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-10 00:45:02,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-10 00:45:02,915 [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-02-10 00:45:03,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-10 00:45:03,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:03,751 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-10 00:45:03,751 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:03,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-10 00:45:03,751 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:03,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:03,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:03,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:03,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:03,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:03,776 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:03,777 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-10 00:45:04,282 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-10 00:45:04,283 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-10 00:45:04,288 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-10 00:45:06,492 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-10 00:45:06,492 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-10 00:45:06,498 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-10 00:45:07,002 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-10 00:45:07,002 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-10 00:45:07,007 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-10 00:45:07,319 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-10 00:45:07,320 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-10 00:45:07,325 [ scc.git] DEBUG Calling 'git fetch origin pull/501/head'
2025-02-10 00:45:08,017 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-10 00:45:08,018 [ scc.git] DEBUG * branch refs/pull/501/head -> FETCH_HEAD
2025-02-10 00:45:08,023 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:08,023 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:08,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:08,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-10 00:45:08,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:08,044 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-10 00:45:08,302 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-10 00:45:08,302 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-10 00:45:08,302 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:08,306 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-10 00:45:08,306 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-10 00:45:08,306 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-10 00:45:08,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:08,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-10 00:45:08,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:08,457 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-10 00:45:08,880 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-10 00:45:08,880 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-10 00:45:08,880 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-10 00:45:08,880 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-10 00:45:08,881 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:08,886 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-10 00:45:08,886 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-10 00:45:08,886 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-10 00:45:08,886 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-10 00:45:08,886 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-10 00:45:08,886 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-10 00:45:08,886 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-10 00:45:08,886 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-10 00:45:09,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:09,026 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-10 00:45:09,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:09,042 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-10 00:45:09,322 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-10 00:45:09,323 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:09,326 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-10 00:45:09,326 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-10 00:45:09,326 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-10 00:45:09,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:09,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-10 00:45:09,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:09,492 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-10 00:45:09,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:09,625 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-10 00:45:09,625 [ scc.git] DEBUG package.json | 2 +-
2025-02-10 00:45:09,625 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-10 00:45:09,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:09,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c5a64f9abf8c6b36b4abad33fb178df0658c6e37'
2025-02-10 00:45:09,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:09,852 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 501 (Add docs/settings.md) c5a64f9abf8c6b36b4abad33fb178df0658c6e37'
2025-02-10 00:45:09,959 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:09,962 [ scc.git] DEBUG README.rst | 36 ++--------------------------
2025-02-10 00:45:09,962 [ scc.git] DEBUG docs/settings.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2025-02-10 00:45:09,962 [ scc.git] DEBUG 2 files changed, 75 insertions(+), 34 deletions(-)
2025-02-10 00:45:09,962 [ scc.git] DEBUG create mode 100644 docs/settings.md
2025-02-10 00:45:10,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:10,215 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:10,262 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:10,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:10,271 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:10,329 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:10,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ed6f7e80> has no local changes
2025-02-10 00:45:10,345 [ 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 501 will-moore 'Add docs/settings.md'
Generated by OMERO-plugins-push#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:10,356 [ scc.git] DEBUG [detached HEAD 9e758f2] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:10,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:10,357 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:10,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-10 00:45:11,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-10 00:45:11,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-10 00:45:12,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-10 00:45:12,665 [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-02-10 00:45:13,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-10 00:45:13,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:13,544 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-10 00:45:13,544 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:13,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-10 00:45:13,544 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:13,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:13,551 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:13,557 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:13,557 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:13,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:13,572 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:13,573 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-10 00:45:13,869 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-10 00:45:13,869 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-10 00:45:13,874 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:13,874 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:13,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:13,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-10 00:45:13,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:13,896 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-10 00:45:13,908 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:13,912 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-10 00:45:13,912 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-10 00:45:13,912 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-10 00:45:13,912 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-10 00:45:13,912 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-10 00:45:13,912 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-10 00:45:14,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:14,067 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:14,113 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:14,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:14,120 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:14,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:14,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec6ac5b0> has no local changes
2025-02-10 00:45:14,173 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:14,183 [ scc.git] DEBUG [detached HEAD 6818702] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:14,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:14,184 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:14,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-10 00:45:14,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-10 00:45:15,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-10 00:45:16,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-10 00:45:16,533 [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-02-10 00:45:16,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-10 00:45:17,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:17,319 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-10 00:45:17,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-10 00:45:18,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-10 00:45:18,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-10 00:45:19,146 [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-02-10 00:45:19,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-10 00:45:19,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:19,953 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-10 00:45:19,953 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:19,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-10 00:45:19,953 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:19,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:19,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:19,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:19,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:19,970 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:19,975 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:19,976 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-10 00:45:20,586 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-10 00:45:20,586 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-10 00:45:20,591 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-10 00:45:21,054 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-10 00:45:21,054 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-10 00:45:21,064 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:21,064 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:21,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:21,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-10 00:45:21,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:21,101 [ 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-02-10 00:45:21,361 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-10 00:45:21,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-10 00:45:21,361 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-10 00:45:21,362 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-10 00:45:21,362 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:45:21,362 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:45:21,371 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-10 00:45:21,379 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-10 00:45:21,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:21,516 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-10 00:45:21,526 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-10 00:45:21,642 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-02-10 00:45:21,649 [ scc.config] DEBUG Found github.token
2025-02-10 00:45:21,649 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-10 00:45:21,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-10 00:45:21,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:21,664 [ 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-02-10 00:45:21,806 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-10 00:45:21,806 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-10 00:45:21,807 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-10 00:45:21,807 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:45:21,807 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:45:21,814 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-10 00:45:21,823 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-10 00:45:21,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:21,961 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-10 00:45:21,968 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-10 00:45:21,975 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/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-02-10 00:45:21,981 [ scc.config] DEBUG Found github.token
2025-02-10 00:45:21,982 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-10 00:45:21,982 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:22,028 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:22,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:22,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:22,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:22,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec6beb80> has no local changes
2025-02-10 00:45:22,089 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:22,099 [ scc.git] DEBUG [detached HEAD 3658323] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:22,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:22,099 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:22,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-10 00:45:22,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-10 00:45:22,963 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-10 00:45:23,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-10 00:45:24,018 [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-02-10 00:45:24,483 [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-02-10 00:45:25,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-10 00:45:25,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:25,399 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-10 00:45:25,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-10 00:45:26,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-10 00:45:26,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-10 00:45:27,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-10 00:45:27,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-10 00:45:28,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-10 00:45:28,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-10 00:45:28,615 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:28,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-10 00:45:28,615 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:28,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:28,621 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:28,626 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:28,626 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:28,631 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:28,636 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:28,636 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-10 00:45:28,944 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-10 00:45:28,945 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-10 00:45:28,949 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:28,950 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:28,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:28,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-10 00:45:28,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:28,967 [ 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-02-10 00:45:29,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:29,030 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-10 00:45:29,030 [ scc.git] DEBUG package.json | 2 +-
2025-02-10 00:45:29,030 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-10 00:45:29,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:29,161 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:29,204 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:29,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:29,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:29,252 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:29,259 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec6b7f40> has no local changes
2025-02-10 00:45:29,259 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:29,268 [ scc.git] DEBUG [detached HEAD a87f165] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:29,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:29,268 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:29,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-10 00:45:29,572 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:29,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-10 00:45:29,572 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:29,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:29,578 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:29,582 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:29,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:29,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:29,594 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:29,594 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:29,594 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:29,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:29,599 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:29,638 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:29,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:29,644 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:29,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:29,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec661940> has no local changes
2025-02-10 00:45:29,690 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:29,698 [ scc.git] DEBUG [detached HEAD 92a0116] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:29,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:29,699 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:30,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-10 00:45:30,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-10 00:45:30,499 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:30,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-10 00:45:30,499 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:30,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:30,506 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:30,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:30,513 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:30,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:30,525 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:30,525 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:30,525 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:30,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:30,531 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:30,577 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:30,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:30,583 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:30,625 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:30,632 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec61b5e0> has no local changes
2025-02-10 00:45:30,633 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:30,642 [ scc.git] DEBUG [detached HEAD 8360833] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:30,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:30,643 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:31,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-10 00:45:31,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-10 00:45:31,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-10 00:45:32,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-10 00:45:32,939 [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-02-10 00:45:33,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-10 00:45:33,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:33,881 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-10 00:45:33,881 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:33,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-10 00:45:33,881 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:33,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:33,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:33,893 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:33,894 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:33,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:33,907 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:33,907 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-10 00:45:34,391 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-10 00:45:34,391 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-10 00:45:34,398 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:34,399 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:34,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:34,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-10 00:45:34,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:34,423 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-10 00:45:34,525 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG Auto-merging setup.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-10 00:45:34,526 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:45:34,526 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:45:34,532 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-10 00:45:34,540 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-10 00:45:34,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:34,662 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-10 00:45:34,670 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-10 00:45:34,803 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-02-10 00:45:34,813 [ scc.config] DEBUG Found github.token
2025-02-10 00:45:34,813 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-10 00:45:34,814 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:34,866 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:34,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:34,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:34,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:34,924 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec61b7f0> has no local changes
2025-02-10 00:45:34,924 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:34,934 [ scc.git] DEBUG [detached HEAD 4446abd] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:34,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:34,935 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:35,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-10 00:45:35,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-10 00:45:36,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-10 00:45:36,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-10 00:45:37,083 [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-02-10 00:45:37,579 [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-02-10 00:45:38,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-10 00:45:38,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-10 00:45:38,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-10 00:45:39,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-10 00:45:39,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-10 00:45:40,384 [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-02-10 00:45:40,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-10 00:45:41,305 [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-02-10 00:45:41,306 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-10 00:45:41,306 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:41,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-10 00:45:41,306 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:41,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:41,313 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:41,318 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:41,318 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:41,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:41,328 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:41,328 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-10 00:45:41,731 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-10 00:45:41,731 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-10 00:45:41,739 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:41,740 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:41,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:41,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-10 00:45:41,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:41,763 [ 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-02-10 00:45:41,828 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:41,831 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-10 00:45:41,831 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-10 00:45:41,831 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-10 00:45:41,831 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-10 00:45:41,832 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-10 00:45:41,834 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-10 00:45:41,835 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-10 00:45:41,835 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-10 00:45:41,835 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-10 00:45:41,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:41,970 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:42,011 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:42,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:42,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:42,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:42,066 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec61b640> has no local changes
2025-02-10 00:45:42,066 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:42,076 [ scc.git] DEBUG [detached HEAD 19c2761] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:42,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:42,076 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:42,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-10 00:45:42,379 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:42,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-10 00:45:42,379 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:42,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:42,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:42,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:42,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:42,398 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:42,404 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:42,405 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:42,405 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:42,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:42,409 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:42,447 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:42,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:42,452 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:42,490 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:42,496 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec688550> has no local changes
2025-02-10 00:45:42,496 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:42,504 [ scc.git] DEBUG [detached HEAD ac9084d] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:42,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:42,505 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:42,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-10 00:45:43,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-10 00:45:43,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-10 00:45:44,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-10 00:45:44,767 [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-02-10 00:45:45,192 [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-02-10 00:45:45,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-10 00:45:46,083 [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-02-10 00:45:46,084 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-10 00:45:46,084 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:46,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-10 00:45:46,084 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:46,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:46,092 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:46,099 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:46,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:46,106 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:46,113 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:46,113 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-10 00:45:46,714 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-10 00:45:46,714 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-10 00:45:46,719 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:46,719 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:46,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:46,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-10 00:45:46,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:46,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-10 00:45:46,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:45:46,773 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-10 00:45:46,774 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-10 00:45:46,774 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-10 00:45:46,774 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-10 00:45:46,774 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-10 00:45:46,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:46,908 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:46,948 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:46,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:46,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:46,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:47,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec688790> has no local changes
2025-02-10 00:45:47,001 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:47,010 [ scc.git] DEBUG [detached HEAD e8808d5] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:47,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:47,011 [ scc.git] INFO Overriding base-branch from master to main
2025-02-10 00:45:47,011 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:47,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-10 00:45:47,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-10 00:45:48,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-10 00:45:48,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-10 00:45:49,214 [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-02-10 00:45:49,685 [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-02-10 00:45:50,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-10 00:45:50,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-10 00:45:51,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-10 00:45:51,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-10 00:45:52,005 [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-02-10 00:45:52,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-10 00:45:52,863 [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-02-10 00:45:52,864 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-10 00:45:52,865 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:52,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-10 00:45:52,865 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:52,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:52,874 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-10 00:45:52,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:52,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-10 00:45:52,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-10 00:45:52,897 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:52,897 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-10 00:45:53,218 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-10 00:45:53,219 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-10 00:45:53,225 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:53,225 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:53,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:53,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-10 00:45:53,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:53,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-10 00:45:53,431 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-10 00:45:53,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-10 00:45:53,431 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:45:53,432 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:45:53,440 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-10 00:45:53,447 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-10 00:45:53,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:53,573 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-10 00:45:53,580 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-10 00:45:53,586 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-10 00:45:53,591 [ scc.config] DEBUG Found github.token
2025-02-10 00:45:53,592 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-10 00:45:53,592 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:53,631 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:53,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:53,637 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:53,676 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:53,683 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec5f2580> has no local changes
2025-02-10 00:45:53,683 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:53,692 [ scc.git] DEBUG [detached HEAD 85e87db] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:53,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:53,692 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:53,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-10 00:45:53,980 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:53,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-10 00:45:53,980 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:53,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:53,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:53,990 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:53,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:53,996 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:54,001 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:54,001 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:54,002 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:54,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:54,007 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:54,047 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:54,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:54,053 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:54,092 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:54,102 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec5f24f0> has no local changes
2025-02-10 00:45:54,102 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:54,115 [ scc.git] DEBUG [detached HEAD 9e53d1a] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:54,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:54,116 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:54,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-10 00:45:54,379 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:54,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-10 00:45:54,379 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:54,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:54,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:54,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:54,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:54,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:54,409 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:54,409 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:54,410 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:54,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:54,418 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:54,467 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:54,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:54,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:54,529 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:54,537 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec604bb0> has no local changes
2025-02-10 00:45:54,538 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:54,548 [ scc.git] DEBUG [detached HEAD c7345d9] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:54,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:54,549 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:54,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-10 00:45:55,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-10 00:45:55,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-10 00:45:56,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-10 00:45:56,665 [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-02-10 00:45:57,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-10 00:45:57,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:45:57,581 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-10 00:45:57,581 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:45:57,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-10 00:45:57,582 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:57,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:57,588 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-10 00:45:57,592 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:45:57,593 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-10 00:45:57,598 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-10 00:45:57,603 [ scc.git] DEBUG Already up to date.
2025-02-10 00:45:57,603 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-10 00:45:57,963 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-10 00:45:57,964 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-10 00:45:57,968 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:45:57,969 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:57,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:57,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-10 00:45:57,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:57,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-10 00:45:58,164 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-10 00:45:58,164 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-10 00:45:58,164 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:45:58,165 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:45:58,171 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-10 00:45:58,179 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-10 00:45:58,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:45:58,315 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-10 00:45:58,321 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-10 00:45:58,327 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-10 00:45:58,332 [ scc.config] DEBUG Found github.token
2025-02-10 00:45:58,332 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-10 00:45:58,332 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:45:58,372 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:45:58,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:45:58,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:45:58,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:45:58,425 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec5aba30> has no local changes
2025-02-10 00:45:58,425 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:45:58,433 [ scc.git] DEBUG [detached HEAD c42e6da] merge master -Dorg -Ssuccess-only
2025-02-10 00:45:58,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:45:58,434 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-10 00:45:58,434 [ scc.repo] DEBUG ## PRs found:
2025-02-10 00:45:58,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-10 00:45:59,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-10 00:45:59,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-10 00:46:00,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-10 00:46:00,590 [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-02-10 00:46:01,060 [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-02-10 00:46:01,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-10 00:46:01,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:46:01,966 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-10 00:46:02,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-10 00:46:02,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-10 00:46:03,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-10 00:46:03,802 [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-02-10 00:46:04,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-10 00:46:04,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-02-10 00:46:04,662 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-10 00:46:05,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-10 00:46:05,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-10 00:46:06,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-10 00:46:06,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-10 00:46:06,511 [ scc.repo] DEBUG ## Branches found:
2025-02-10 00:46:06,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-10 00:46:06,511 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:46:06,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:46:06,517 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-10 00:46:06,524 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-10 00:46:06,524 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-10 00:46:06,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-10 00:46:06,537 [ scc.git] DEBUG Already up to date.
2025-02-10 00:46:06,538 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-10 00:46:06,863 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-10 00:46:06,863 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-10 00:46:06,868 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-10 00:46:07,191 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-10 00:46:07,191 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-10 00:46:07,196 [ scc.git] DEBUG ## Unique users: []
2025-02-10 00:46:07,196 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:46:07,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:46:07,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-10 00:46:07,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:46:07,220 [ 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-02-10 00:46:07,423 [ 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-02-10 00:46:07,423 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-10 00:46:07,424 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-10 00:46:07,430 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-10 00:46:07,436 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-10 00:46:07,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:07,576 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-10 00:46:07,585 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-10 00:46:07,593 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#328](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-10 00:46:07,599 [ scc.config] DEBUG Found github.token
2025-02-10 00:46:07,599 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-10 00:46:07,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-10 00:46:07,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:46:07,614 [ 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-02-10 00:46:07,625 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-10 00:46:07,628 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-10 00:46:07,628 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-10 00:46:07,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:07,954 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-10 00:46:07,999 [ scc.git] DEBUG Get sha1 of %s
2025-02-10 00:46:07,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-10 00:46:08,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:46:08,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:46:08,065 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ec5ab670> has no local changes
2025-02-10 00:46:08,066 [ 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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:46:08,076 [ scc.git] DEBUG [detached HEAD 160f91e] merge master -Dorg -Ssuccess-only
2025-02-10 00:46:08,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:08,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-10 00:46:08,158 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-10 00:46:08,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:08,349 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-10 00:46:08,354 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-10 00:46:08,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:08,735 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-10 00:46:08,740 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-10 00:46:09,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:09,112 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-10 00:46:09,119 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-10 00:46:09,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:09,509 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-10 00:46:09,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:09,925 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-10 00:46:09,931 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-10 00:46:10,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:10,315 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-10 00:46:10,321 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-10 00:46:10,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:10,724 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-10 00:46:10,731 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-10 00:46:11,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:11,101 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-10 00:46:11,108 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-10 00:46:11,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:11,489 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-10 00:46:11,496 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-10 00:46:11,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:11,870 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-10 00:46:11,877 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-10 00:46:12,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:12,287 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-10 00:46:12,291 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-10 00:46:12,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:12,670 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-10 00:46:12,675 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-10 00:46:13,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:13,075 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-10 00:46:13,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:13,436 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-10 00:46:13,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:13,809 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-10 00:46:13,816 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-10 00:46:14,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:14,205 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-10 00:46:14,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:14,577 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-10 00:46:14,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:14,974 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-10 00:46:14,979 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-10 00:46:15,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:15,349 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-10 00:46:15,356 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-10 00:46:15,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:15,753 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-10 00:46:15,759 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-10 00:46:16,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:16,134 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-10 00:46:16,140 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-10 00:46:16,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-10 00:46:16,510 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-10 00:46:16,511 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-10 00:46:16,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2ee7f7be0> has local changes
2025-02-10 00:46:16,607 [ 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 431 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `89ee6e8`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
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 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- 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'
- PR 69 dominikl 'Fix help text for impo/export commands'
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 616 Rdornier 'Fix labels around border' (user: Rdornier)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
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 501 will-moore 'Add docs/settings.md'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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#328 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/328/)'
2025-02-10 00:46:16,624 [ scc.git] DEBUG [detached HEAD 872a1b3] merge master -Dorg -Ssuccess-only
2025-02-10 00:46:16,624 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-10 00:46:16,625 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-10 00:46:16,625 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 431 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `89ee6e8`'
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-10 00:46:16,625 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-10 00:46:16,625 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-10 00:46:16,625 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-10 00:46:16,625 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-10 00:46:16,625 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,625 [ scc.merge] INFO
2025-02-10 00:46:16,625 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,625 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-10 00:46:16,626 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-10 00:46:16,626 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-10 00:46:16,626 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border' (user: Rdornier)
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-10 00:46:16,626 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-10 00:46:16,626 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-10 00:46:16,626 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,626 [ scc.merge] INFO
2025-02-10 00:46:16,626 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,626 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-10 00:46:16,627 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-10 00:46:16,627 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 501 will-moore 'Add docs/settings.md'
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-10 00:46:16,627 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-10 00:46:16,627 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-10 00:46:16,627 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-10 00:46:16,627 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-10 00:46:16,627 [ scc.merge] INFO
2025-02-10 00:46:16,627 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-10 00:46:16,628 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-10 00:46:16,628 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-10 00:46:16,628 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,628 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-10 00:46:16,628 [ scc.merge] INFO
2025-02-10 00:46:16,628 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-10 00:46:16,628 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-10 00:46:16,629 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,629 [ scc.merge] INFO Repository: ome/scripts
2025-02-10 00:46:16,629 [ scc.merge] INFO Excluded PRs:
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-10 00:46:16,629 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-10 00:46:16,629 [ scc.merge] INFO Already up to date.
2025-02-10 00:46:16,629 [ scc.merge] INFO
2025-02-10 00:46:16,630 [ scc.merge] INFO Merged PRs:
2025-02-10 00:46:16,630 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-10 00:46:16,630 [ scc.merge] INFO
2025-02-10 00:46:16,630 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-10 00:46:16,630 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-10 00:46:16,630 [ scc.merge] INFO
2025-02-10 00:46:16,630 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-10 00:46:16,630 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-10 00:46:16,637 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-10 00:46:16,644 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-10 00:46:16,653 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-10 00:46:16,661 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-10 00:46:16,670 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-10 00:46:16,676 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-10 00:46:16,682 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-10 00:46:16,688 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-10 00:46:16,695 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-10 00:46:16,702 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-10 00:46:16,708 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-10 00:46:16,717 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-10 00:46:16,725 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-10 00:46:16,734 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-10 00:46:16,742 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-10 00:46:16,749 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-10 00:46:16,754 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-10 00:46:16,760 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-10 00:46:16,769 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-10 00:46:16,780 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-10 00:46:16,787 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-10 00:46:16,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-10 00:46:16,793 [ scc.git] DEBUG Calling 'git remote'
2025-02-10 00:46:16,799 [ 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 e425ca5] 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 9cc36cde
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 89ee6e8
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 31dd96b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-02-10 00:47:06,651 [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-02-10 00:47:15,231 [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-02-10 00:47:17,504 [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-02-10 00:47:21,845 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-10 00:48:00,227 [ 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}
