Skipping 114 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-24 01:14:55,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:14:55,318 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:14:55,324 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:14:55,324 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:14:55,331 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:14:55,336 [ scc.git] DEBUG Already up to date.
2025-01-24 01:14:55,337 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-24 01:14:55,686 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-24 01:14:55,686 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-24 01:14:55,691 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:14:55,691 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:14:55,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:14:55,698 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-24 01:14:55,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:14:55,713 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-24 01:14:55,745 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-24 01:14:55,745 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:14:55,749 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-24 01:14:55,749 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-24 01:14:55,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:14:55,879 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:14:55,925 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:14:55,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:14:55,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:14:55,974 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:14:55,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd7fd6e20> has no local changes
2025-01-24 01:14:55,983 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:14:55,992 [ scc.git] DEBUG [detached HEAD bfee77f] merge master -Dorg -Ssuccess-only
2025-01-24 01:14:55,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:14:55,993 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:14:56,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-24 01:14:56,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-24 01:14:57,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-24 01:14:57,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-24 01:14:57,767 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:14:58,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-24 01:14:58,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:14:59,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:14:59,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-24 01:15:00,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:00,255 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-24 01:15:00,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-24 01:15:00,693 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:01,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-24 01:15:01,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:02,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:02,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-24 01:15:03,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:03,107 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-24 01:15:03,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-24 01:15:03,568 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:04,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-24 01:15:04,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:05,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:05,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-24 01:15:06,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:06,133 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-24 01:15:06,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-24 01:15:07,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-24 01:15:07,019 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:07,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-24 01:15:08,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:08,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:09,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-24 01:15:09,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:09,451 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-24 01:15:09,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-24 01:15:09,910 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:10,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-24 01:15:10,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:11,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:12,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-24 01:15:12,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:12,427 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-24 01:15:12,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-24 01:15:12,890 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:13,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-24 01:15:13,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:14,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:15,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-24 01:15:15,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:15,557 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-24 01:15:15,557 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:15:15,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-24 01:15:15,558 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:15,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:15,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:15:15,569 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:15:15,570 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:15:15,575 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:15:15,580 [ scc.git] DEBUG Already up to date.
2025-01-24 01:15:15,580 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-24 01:15:15,886 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:15,887 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-24 01:15:15,891 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-24 01:15:16,180 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:16,180 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-24 01:15:16,185 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-24 01:15:16,486 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:16,487 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-24 01:15:16,491 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-24 01:15:16,780 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:16,781 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-24 01:15:16,786 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-24 01:15:17,075 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:17,075 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-24 01:15:17,080 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-24 01:15:17,361 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-24 01:15:17,361 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-24 01:15:17,366 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:15:17,367 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:17,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:17,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-24 01:15:17,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:17,394 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-24 01:15:17,424 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:17,429 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-24 01:15:17,429 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-24 01:15:17,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:17,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-24 01:15:17,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:17,595 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-24 01:15:17,670 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-24 01:15:17,671 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:17,677 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-24 01:15:17,677 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-24 01:15:17,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:17,950 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-24 01:15:17,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:17,964 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-24 01:15:18,020 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-24 01:15:18,020 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-24 01:15:18,020 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:15:18,021 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:15:18,027 [ scc.git] DEBUG Calling 'git reset --hard 9195ebf740e786ea283a68daaf273f8859ab65dd'
2025-01-24 01:15:18,039 [ scc.git] DEBUG HEAD is now at 9195ebf merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-24 01:15:18,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:18,336 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-24 01:15:18,342 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-24 01:15:18,350 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-24 01:15:18,356 [ scc.config] DEBUG Found github.token
2025-01-24 01:15:18,357 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-24 01:15:18,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-24 01:15:18,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:18,386 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-24 01:15:18,552 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-24 01:15:18,553 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:18,558 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-24 01:15:18,558 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-24 01:15:18,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:18,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-24 01:15:18,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:18,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-24 01:15:18,784 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-24 01:15:18,785 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:18,790 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-24 01:15:18,790 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-24 01:15:19,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:19,104 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-24 01:15:19,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:19,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-24 01:15:19,303 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-24 01:15:19,303 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-24 01:15:19,303 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:15:19,304 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:15:19,311 [ scc.git] DEBUG Calling 'git reset --hard 66573bb54f71bd00f5fd68be05dd80c708d56cd6'
2025-01-24 01:15:19,320 [ scc.git] DEBUG HEAD is now at 66573bb merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-24 01:15:19,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:19,505 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-24 01:15:19,514 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-24 01:15:19,520 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-24 01:15:19,526 [ scc.config] DEBUG Found github.token
2025-01-24 01:15:19,526 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-24 01:15:19,526 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:15:19,570 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:19,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:19,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:15:19,620 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:15:19,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd7fc8b20> has no local changes
2025-01-24 01:15:19,629 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:15:19,640 [ scc.git] DEBUG [detached HEAD fd9a186] merge master -Dorg -Ssuccess-only
2025-01-24 01:15:19,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:15:19,641 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:15:20,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-24 01:15:20,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-24 01:15:21,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-24 01:15:21,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-24 01:15:22,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:22,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:23,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/c6029c6c1e486fdfbc75552eba8472e754975925 HTTP/1.1" 200 None
2025-01-24 01:15:23,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/c6029c6c1e486fdfbc75552eba8472e754975925?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:23,430 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-24 01:15:23,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-24 01:15:23,885 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:24,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-24 01:15:24,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:25,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:25,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-24 01:15:26,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:26,402 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-24 01:15:26,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-24 01:15:27,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-24 01:15:27,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-24 01:15:28,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-24 01:15:28,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-24 01:15:29,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:29,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:30,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-24 01:15:30,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:30,634 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-24 01:15:31,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-24 01:15:31,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-24 01:15:32,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-24 01:15:32,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:33,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:15:33,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-24 01:15:33,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:33,913 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-24 01:15:34,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-24 01:15:34,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-24 01:15:35,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-24 01:15:35,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-24 01:15:36,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:36,657 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-24 01:15:36,657 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:15:36,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-24 01:15:36,657 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:36,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:36,665 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:15:36,673 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:15:36,673 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:15:36,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:15:36,689 [ scc.git] DEBUG Already up to date.
2025-01-24 01:15:36,689 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-24 01:15:38,668 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-24 01:15:38,668 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-24 01:15:38,672 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-24 01:15:40,694 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-24 01:15:40,695 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-24 01:15:40,702 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-24 01:15:41,045 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-24 01:15:41,046 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-24 01:15:41,051 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-24 01:15:41,352 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-24 01:15:41,352 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-24 01:15:41,357 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-24 01:15:42,161 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-24 01:15:42,161 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-24 01:15:42,166 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:15:42,167 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:42,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:42,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-24 01:15:42,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:42,187 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-24 01:15:42,265 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-24 01:15:42,266 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:42,270 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-24 01:15:42,270 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-24 01:15:42,270 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-24 01:15:42,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:42,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-24 01:15:42,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:42,423 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-24 01:15:42,782 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-24 01:15:42,782 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-24 01:15:42,782 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-24 01:15:42,782 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-24 01:15:42,783 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:42,787 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-24 01:15:42,787 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-24 01:15:42,788 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-24 01:15:42,788 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-24 01:15:42,788 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-24 01:15:42,788 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-24 01:15:42,788 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-24 01:15:42,788 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-24 01:15:42,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:42,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-24 01:15:42,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:42,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-24 01:15:42,954 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-24 01:15:42,955 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:42,957 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-24 01:15:42,957 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-24 01:15:42,957 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-24 01:15:43,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:43,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-24 01:15:43,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:43,324 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-24 01:15:43,396 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:43,413 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-24 01:15:43,414 [ scc.git] DEBUG package.json | 2 +-
2025-01-24 01:15:43,414 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-24 01:15:43,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:43,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-24 01:15:43,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:43,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) c6029c6c1e486fdfbc75552eba8472e754975925'
2025-01-24 01:15:44,057 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-24 01:15:44,058 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-24 01:15:44,058 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-24 01:15:44,058 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-24 01:15:44,058 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-24 01:15:44,058 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:44,063 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-24 01:15:44,064 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-24 01:15:44,064 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-24 01:15:44,064 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-24 01:15:44,064 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-24 01:15:44,064 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-24 01:15:44,064 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-24 01:15:44,064 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-24 01:15:44,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:44,194 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:15:44,237 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:44,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:44,243 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:15:44,286 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:15:44,295 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd7f87e80> has no local changes
2025-01-24 01:15:44,295 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:15:44,312 [ scc.git] DEBUG [detached HEAD 31ecb54] merge master -Dorg -Ssuccess-only
2025-01-24 01:15:44,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:15:44,314 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:15:44,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-24 01:15:45,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-24 01:15:45,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-24 01:15:46,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-24 01:15:46,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:47,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-24 01:15:47,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:47,593 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-24 01:15:47,594 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:15:47,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-24 01:15:47,594 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:47,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:47,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:15:47,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:15:47,606 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:15:47,612 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:15:47,618 [ scc.git] DEBUG Already up to date.
2025-01-24 01:15:47,618 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-24 01:15:48,437 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-24 01:15:48,438 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-24 01:15:48,443 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:15:48,443 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:48,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:48,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-24 01:15:48,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:48,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-24 01:15:48,472 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:15:48,475 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-24 01:15:48,475 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-24 01:15:48,475 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-24 01:15:48,475 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-24 01:15:48,475 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-24 01:15:48,475 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-24 01:15:48,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:48,617 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:15:48,657 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:48,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:48,662 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:15:48,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:15:48,717 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd4f5a5b0> has no local changes
2025-01-24 01:15:48,718 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:15:48,728 [ scc.git] DEBUG [detached HEAD e86a331] merge master -Dorg -Ssuccess-only
2025-01-24 01:15:48,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:15:48,728 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:15:49,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-24 01:15:49,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-24 01:15:50,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-24 01:15:50,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-24 01:15:51,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:51,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-24 01:15:51,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:51,938 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-24 01:15:52,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-24 01:15:52,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-24 01:15:53,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-24 01:15:53,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:54,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-24 01:15:54,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:15:54,692 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-24 01:15:54,692 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:15:54,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-24 01:15:54,692 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:54,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:54,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:15:54,706 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:15:54,706 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:15:54,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:15:54,720 [ scc.git] DEBUG Already up to date.
2025-01-24 01:15:54,720 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-24 01:15:55,576 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-24 01:15:55,576 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-24 01:15:55,582 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-24 01:15:56,075 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-24 01:15:56,075 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-24 01:15:56,080 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:15:56,081 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:56,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:56,086 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-24 01:15:56,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:56,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-24 01:15:56,491 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-24 01:15:56,491 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-24 01:15:56,491 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-24 01:15:56,491 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-24 01:15:56,492 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:15:56,492 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:15:56,499 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-24 01:15:56,507 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-24 01:15:56,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:56,642 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-24 01:15:56,650 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-24 01:15:56,656 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-24 01:15:56,660 [ scc.config] DEBUG Found github.token
2025-01-24 01:15:56,661 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-24 01:15:56,661 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-24 01:15:56,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:56,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-24 01:15:56,906 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-24 01:15:56,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-24 01:15:56,907 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-24 01:15:56,907 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:15:56,907 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:15:56,916 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-24 01:15:56,924 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-24 01:15:57,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:15:57,070 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-24 01:15:57,078 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-24 01:15:57,085 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-01-24 01:15:57,090 [ scc.config] DEBUG Found github.token
2025-01-24 01:15:57,091 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-24 01:15:57,091 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:15:57,174 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:15:57,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:15:57,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:15:57,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:15:57,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd4f6db80> has no local changes
2025-01-24 01:15:57,233 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:15:57,242 [ scc.git] DEBUG [detached HEAD 240c588] merge master -Dorg -Ssuccess-only
2025-01-24 01:15:57,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:15:57,242 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:15:57,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-24 01:15:58,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-01-24 01:15:58,071 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-24 01:15:58,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-24 01:15:59,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:15:59,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:16:00,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-01-24 01:16:00,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:00,499 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-24 01:16:00,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-24 01:16:01,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-24 01:16:01,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-24 01:16:02,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-24 01:16:02,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-24 01:16:03,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-24 01:16:03,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-24 01:16:03,772 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:03,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-24 01:16:03,772 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:03,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:03,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:03,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:03,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:03,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:03,795 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:03,796 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-01-24 01:16:04,128 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-01-24 01:16:04,128 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-01-24 01:16:04,133 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:04,133 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:04,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,139 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-24 01:16:04,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-01-24 01:16:04,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:16:04,164 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-01-24 01:16:04,164 [ scc.git] DEBUG package.json | 2 +-
2025-01-24 01:16:04,164 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-01-24 01:16:04,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:04,290 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:04,333 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:04,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,340 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:04,380 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:04,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd7f81f40> has no local changes
2025-01-24 01:16:04,388 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:04,396 [ scc.git] DEBUG [detached HEAD 5675288] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:04,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:04,397 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:04,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-24 01:16:04,743 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:04,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-24 01:16:04,743 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:04,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,750 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:04,756 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:04,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:04,762 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:04,768 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:04,768 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:04,768 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:04,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,773 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:04,814 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:04,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:04,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:04,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:04,865 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd470f940> has no local changes
2025-01-24 01:16:04,865 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:04,874 [ scc.git] DEBUG [detached HEAD 0ef9574] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:04,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:04,875 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:05,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-24 01:16:05,154 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:05,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-24 01:16:05,154 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:05,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:05,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:05,164 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:05,165 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:05,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:05,175 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:05,175 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:05,175 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:05,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:05,180 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:05,219 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:05,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:05,225 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:05,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:05,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46c95e0> has no local changes
2025-01-24 01:16:05,275 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:05,284 [ scc.git] DEBUG [detached HEAD 839a51c] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:05,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:05,285 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:05,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-24 01:16:06,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-24 01:16:06,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-24 01:16:07,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-24 01:16:07,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:08,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-24 01:16:08,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:08,438 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-24 01:16:08,439 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:08,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-24 01:16:08,439 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:08,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:08,444 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:08,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:08,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:08,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:08,462 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:08,463 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-24 01:16:08,955 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-24 01:16:08,955 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-24 01:16:08,961 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:08,961 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:08,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:08,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-24 01:16:08,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:08,980 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-24 01:16:09,149 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG Auto-merging setup.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-24 01:16:09,149 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:16:09,149 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:16:09,156 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-24 01:16:09,164 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-24 01:16:09,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:09,313 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-24 01:16:09,320 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-24 01:16:09,325 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-01-24 01:16:09,331 [ scc.config] DEBUG Found github.token
2025-01-24 01:16:09,331 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-24 01:16:09,331 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:09,373 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:09,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:09,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:09,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:09,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46c97f0> has no local changes
2025-01-24 01:16:09,427 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:09,435 [ scc.git] DEBUG [detached HEAD efc028d] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:09,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:09,436 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:09,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-24 01:16:10,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-24 01:16:10,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-24 01:16:11,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-24 01:16:11,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:12,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:16:12,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-24 01:16:13,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-24 01:16:13,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-24 01:16:14,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-24 01:16:14,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-24 01:16:15,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:15,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-24 01:16:15,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:15,985 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-24 01:16:15,986 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:15,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-24 01:16:15,986 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:15,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:15,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:15,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:15,998 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:16,003 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:16,009 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:16,010 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-24 01:16:16,393 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-24 01:16:16,393 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-24 01:16:16,397 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:16,398 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:16,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:16,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-24 01:16:16,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:16,416 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-01-24 01:16:16,430 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:16:16,433 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-24 01:16:16,433 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-24 01:16:16,433 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-24 01:16:16,433 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-24 01:16:16,433 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-24 01:16:16,434 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-24 01:16:16,434 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-24 01:16:16,434 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-24 01:16:16,434 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-24 01:16:16,434 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-24 01:16:16,436 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-24 01:16:16,437 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-24 01:16:16,437 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-24 01:16:16,437 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-24 01:16:16,437 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-24 01:16:16,437 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-24 01:16:16,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:16,573 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:16,617 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:16,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:16,623 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:16,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:16,669 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46c9640> has no local changes
2025-01-24 01:16:16,669 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:16,679 [ scc.git] DEBUG [detached HEAD 89edba8] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:16,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:16,679 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:16,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-24 01:16:16,983 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:16,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-24 01:16:16,984 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:16,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:16,990 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:16,996 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:16,996 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:17,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:17,009 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:17,009 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:17,009 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:17,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:17,014 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:17,055 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:17,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:17,061 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:17,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:17,105 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd47314c0> has no local changes
2025-01-24 01:16:17,105 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:17,113 [ scc.git] DEBUG [detached HEAD 0c6bc87] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:17,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:17,113 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:17,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-24 01:16:17,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-24 01:16:18,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-24 01:16:18,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-24 01:16:19,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:19,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:16:20,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-24 01:16:20,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:20,620 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-24 01:16:20,620 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:20,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-24 01:16:20,621 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:20,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:20,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:20,633 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:20,633 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:20,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:20,646 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:20,646 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-24 01:16:21,343 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-24 01:16:21,343 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-24 01:16:21,348 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:21,349 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:21,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:21,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-24 01:16:21,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:21,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-24 01:16:21,378 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:16:21,380 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-24 01:16:21,381 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-24 01:16:21,381 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-24 01:16:21,381 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-24 01:16:21,381 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-24 01:16:21,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:21,515 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:21,558 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:21,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:21,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:21,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:21,610 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd4731790> has no local changes
2025-01-24 01:16:21,611 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:21,620 [ scc.git] DEBUG [detached HEAD addf1ae] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:21,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:21,621 [ scc.git] INFO Overriding base-branch from master to main
2025-01-24 01:16:21,621 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:22,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-24 01:16:22,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-24 01:16:22,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-24 01:16:23,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-24 01:16:23,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:24,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:16:24,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-24 01:16:25,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-24 01:16:25,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-24 01:16:26,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-24 01:16:26,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:27,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-24 01:16:27,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:27,606 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-24 01:16:27,607 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:27,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-24 01:16:27,607 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:27,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:27,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-24 01:16:27,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:27,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-24 01:16:27,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-24 01:16:27,629 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:27,629 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-24 01:16:28,060 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-24 01:16:28,061 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-24 01:16:28,065 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:28,065 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:28,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-24 01:16:28,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,084 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-24 01:16:28,259 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-24 01:16:28,260 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-24 01:16:28,260 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:16:28,260 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:16:28,266 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-24 01:16:28,273 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-24 01:16:28,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:28,407 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-24 01:16:28,413 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-24 01:16:28,419 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-24 01:16:28,425 [ scc.config] DEBUG Found github.token
2025-01-24 01:16:28,426 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-24 01:16:28,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:28,466 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:28,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,472 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:28,515 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:28,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46a1580> has no local changes
2025-01-24 01:16:28,522 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:28,531 [ scc.git] DEBUG [detached HEAD 9369cb1] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:28,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:28,531 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:28,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-24 01:16:28,808 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:28,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-24 01:16:28,808 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:28,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,813 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:28,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:28,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:28,825 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:28,831 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:28,831 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:28,831 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:28,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,836 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:28,876 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:28,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:28,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:28,921 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:28,929 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46a14f0> has no local changes
2025-01-24 01:16:28,929 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:28,938 [ scc.git] DEBUG [detached HEAD 8dced7c] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:28,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:28,939 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:29,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-24 01:16:29,232 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:29,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-24 01:16:29,233 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:29,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:29,239 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:29,245 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:29,245 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:29,252 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:29,259 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:29,259 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:29,259 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:29,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:29,265 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:29,305 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:29,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:29,312 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:29,377 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:29,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd46b2bb0> has no local changes
2025-01-24 01:16:29,386 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:29,396 [ scc.git] DEBUG [detached HEAD f870827] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:29,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:29,397 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:29,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-24 01:16:30,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-24 01:16:30,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-24 01:16:31,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-24 01:16:31,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:32,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-24 01:16:32,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:32,527 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-24 01:16:32,528 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:32,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-24 01:16:32,528 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:32,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:32,534 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-24 01:16:32,540 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:32,540 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-24 01:16:32,546 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-24 01:16:32,552 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:32,552 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-24 01:16:32,987 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-24 01:16:32,987 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-24 01:16:32,992 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:32,992 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:32,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:32,999 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-24 01:16:33,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:33,010 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-24 01:16:33,163 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-24 01:16:33,163 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-24 01:16:33,163 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:16:33,163 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:16:33,170 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-24 01:16:33,177 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-24 01:16:33,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:33,312 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-24 01:16:33,319 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-24 01:16:33,325 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-24 01:16:33,330 [ scc.config] DEBUG Found github.token
2025-01-24 01:16:33,330 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-24 01:16:33,330 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:33,373 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:33,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:33,380 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:33,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:33,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd4658a30> has no local changes
2025-01-24 01:16:33,428 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:33,436 [ scc.git] DEBUG [detached HEAD 36b7bb9] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:33,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:33,437 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-24 01:16:33,437 [ scc.repo] DEBUG ## PRs found:
2025-01-24 01:16:33,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-24 01:16:34,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-24 01:16:34,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-24 01:16:35,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-24 01:16:35,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:35,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-24 01:16:36,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-24 01:16:36,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:36,838 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-24 01:16:37,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-24 01:16:37,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-24 01:16:38,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-24 01:16:38,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-24 01:16:38,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-24 01:16:39,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-24 01:16:39,379 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-24 01:16:39,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-24 01:16:40,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-24 01:16:40,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-24 01:16:41,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-24 01:16:41,269 [ scc.repo] DEBUG ## Branches found:
2025-01-24 01:16:41,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-24 01:16:41,270 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:41,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:41,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-24 01:16:41,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-24 01:16:41,282 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-24 01:16:41,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-24 01:16:41,294 [ scc.git] DEBUG Already up to date.
2025-01-24 01:16:41,294 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-24 01:16:41,993 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-24 01:16:41,993 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-24 01:16:41,999 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-24 01:16:42,765 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-24 01:16:42,765 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-24 01:16:42,770 [ scc.git] DEBUG ## Unique users: []
2025-01-24 01:16:42,770 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:42,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:42,776 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-24 01:16:42,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:42,789 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-24 01:16:42,836 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-24 01:16:42,836 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-24 01:16:42,836 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-24 01:16:42,843 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-24 01:16:42,850 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-24 01:16:42,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:42,984 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-24 01:16:42,993 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-24 01:16:42,999 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#314](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-24 01:16:43,005 [ scc.config] DEBUG Found github.token
2025-01-24 01:16:43,006 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-24 01:16:43,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-24 01:16:43,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:43,020 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-24 01:16:43,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-24 01:16:43,035 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-24 01:16:43,035 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-24 01:16:43,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:43,435 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-24 01:16:43,478 [ scc.git] DEBUG Get sha1 of %s
2025-01-24 01:16:43,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-24 01:16:43,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:43,533 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:43,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cd4658670> has no local changes
2025-01-24 01:16:43,544 [ 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#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:43,555 [ scc.git] DEBUG [detached HEAD 00626e1] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:43,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:43,556 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-24 01:16:43,638 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-24 01:16:43,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:43,834 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-24 01:16:43,839 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-24 01:16:44,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:44,223 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-24 01:16:44,227 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-24 01:16:44,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:44,638 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-24 01:16:44,643 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-24 01:16:45,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:45,042 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-24 01:16:45,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:45,428 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-24 01:16:45,433 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-24 01:16:45,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:45,810 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-24 01:16:45,817 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-24 01:16:46,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:46,211 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-24 01:16:46,216 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-24 01:16:46,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:46,602 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-24 01:16:46,606 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-24 01:16:46,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:46,987 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-24 01:16:46,992 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-24 01:16:47,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:47,366 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-24 01:16:47,371 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-24 01:16:47,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:47,754 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-24 01:16:47,758 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-24 01:16:48,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:48,150 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-24 01:16:48,155 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-24 01:16:48,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:48,545 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-24 01:16:48,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:48,934 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-24 01:16:49,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:49,316 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-24 01:16:49,322 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-24 01:16:49,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:49,704 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-24 01:16:50,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:50,105 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-24 01:16:50,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:50,494 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-24 01:16:50,499 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-24 01:16:50,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:50,873 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-24 01:16:50,878 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-24 01:16:51,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:51,257 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-24 01:16:51,262 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-24 01:16:51,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:51,647 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-24 01:16:51,652 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-24 01:16:52,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-24 01:16:52,030 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-24 01:16:52,030 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-24 01:16:52,112 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cdd0b7be0> has local changes
2025-01-24 01:16:52,112 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
- PR 610 will-moore 'Add docs/contributing.rst'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#314 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/314/)'
2025-01-24 01:16:52,127 [ scc.git] DEBUG [detached HEAD 98774c4] merge master -Dorg -Ssuccess-only
2025-01-24 01:16:52,127 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-24 01:16:52,127 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-24 01:16:52,127 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-24 01:16:52,128 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-24 01:16:52,128 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-24 01:16:52,128 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-24 01:16:52,128 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-24 01:16:52,128 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-24 01:16:52,128 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-24 01:16:52,128 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-24 01:16:52,128 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-24 01:16:52,128 [ scc.merge] INFO
2025-01-24 01:16:52,128 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-24 01:16:52,128 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-24 01:16:52,129 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 609 dependabot[bot] 'Bump vite from 5.4.8 to 5.4.12'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-24 01:16:52,129 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-24 01:16:52,129 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-24 01:16:52,129 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-24 01:16:52,129 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,129 [ scc.merge] INFO
2025-01-24 01:16:52,129 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-24 01:16:52,129 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-24 01:16:52,130 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-24 01:16:52,130 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,130 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-24 01:16:52,130 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,130 [ scc.merge] INFO
2025-01-24 01:16:52,130 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-24 01:16:52,131 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-24 01:16:52,131 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,131 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-24 01:16:52,131 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,131 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-24 01:16:52,132 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,132 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,132 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-24 01:16:52,132 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] INFO Repository: ome/scripts
2025-01-24 01:16:52,132 [ scc.merge] INFO Excluded PRs:
2025-01-24 01:16:52,132 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-24 01:16:52,132 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-24 01:16:52,132 [ scc.merge] INFO Already up to date.
2025-01-24 01:16:52,132 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] INFO Merged PRs:
2025-01-24 01:16:52,132 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-24 01:16:52,132 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-24 01:16:52,132 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-24 01:16:52,132 [ scc.merge] INFO
2025-01-24 01:16:52,132 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-24 01:16:52,132 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-24 01:16:52,138 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-24 01:16:52,143 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-24 01:16:52,147 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-24 01:16:52,152 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-24 01:16:52,157 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-24 01:16:52,162 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-24 01:16:52,167 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-24 01:16:52,172 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-24 01:16:52,177 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-24 01:16:52,181 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-24 01:16:52,186 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-24 01:16:52,191 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-24 01:16:52,196 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-24 01:16:52,201 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-24 01:16:52,206 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-24 01:16:52,210 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-24 01:16:52,215 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-24 01:16:52,220 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-24 01:16:52,225 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-24 01:16:52,230 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-24 01:16:52,234 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-24 01:16:52,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-24 01:16:52,239 [ scc.git] DEBUG Calling 'git remote'
2025-01-24 01:16:52,244 [ 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 a9430e5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from a80640a9
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD c833ccf] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-24 01:17:37,390 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-01-24 01:17:46,071 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-01-24 01:17:48,358 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-24 01:17:52,753 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-24 01:18:32,684 [ 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}
