Console Output
Skipping 83 KB..
Full Log up to date.
2024-12-10 00:41:59,236 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-10 00:41:59,573 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-10 00:41:59,573 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-12-10 00:41:59,578 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:41:59,578 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:41:59,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:41:59,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-10 00:41:59,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:41:59,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-10 00:41:59,652 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-10 00:41:59,653 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:41:59,656 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-12-10 00:41:59,656 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-10 00:41:59,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:41:59,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:41:59,842 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:41:59,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:41:59,848 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:41:59,890 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:41:59,897 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc636738e50> has no local changes
2024-12-10 00:41:59,897 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:41:59,907 [ scc.git] DEBUG [detached HEAD 1efc261] merge master -Dorg -Ssuccess-only
2024-12-10 00:41:59,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:41:59,907 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:00,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-10 00:42:00,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-10 00:42:01,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-10 00:42:01,407 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:02,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-10 00:42:02,516 [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
2024-12-10 00:42:03,023 [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
2024-12-10 00:42:03,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-10 00:42:04,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:04,044 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-10 00:42:04,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-10 00:42:04,514 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:05,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-10 00:42:05,571 [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
2024-12-10 00:42:06,206 [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
2024-12-10 00:42:06,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-10 00:42:07,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:07,218 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-10 00:42:07,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-10 00:42:07,682 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:08,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-10 00:42:08,784 [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
2024-12-10 00:42:09,346 [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
2024-12-10 00:42:09,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-10 00:42:10,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:10,242 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-10 00:42:10,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-10 00:42:11,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-10 00:42:11,214 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:11,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-10 00:42:12,315 [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
2024-12-10 00:42:12,782 [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
2024-12-10 00:42:13,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-10 00:42:13,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:13,750 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-10 00:42:14,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-10 00:42:14,234 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:14,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-10 00:42:15,319 [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
2024-12-10 00:42:15,792 [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
2024-12-10 00:42:16,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-10 00:42:16,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:16,806 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-10 00:42:17,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-10 00:42:17,285 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-10 00:42:17,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-10 00:42:18,431 [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
2024-12-10 00:42:18,953 [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
2024-12-10 00:42:19,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-10 00:42:19,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:19,918 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-10 00:42:19,918 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:19,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-10 00:42:19,918 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:19,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:19,924 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:19,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:19,929 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:19,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:19,939 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:19,940 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-10 00:42:20,246 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:20,246 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-10 00:42:20,251 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-10 00:42:20,556 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:20,556 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-10 00:42:20,561 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-10 00:42:20,851 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:20,851 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-10 00:42:20,855 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-10 00:42:21,183 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:21,183 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-10 00:42:21,188 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-10 00:42:21,490 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:21,490 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-10 00:42:21,495 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-10 00:42:21,771 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-10 00:42:21,771 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-10 00:42:21,777 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:21,777 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:21,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:21,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-10 00:42:21,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:21,792 [ 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'
2024-12-10 00:42:21,804 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:21,809 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-10 00:42:21,809 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-10 00:42:21,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:21,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-10 00:42:21,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:21,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-10 00:42:21,985 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-10 00:42:21,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:21,991 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-10 00:42:21,991 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-10 00:42:22,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:22,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-10 00:42:22,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:22,350 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-10 00:42:22,367 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-10 00:42:22,367 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-10 00:42:22,367 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:42:22,368 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:42:22,374 [ scc.git] DEBUG Calling 'git reset --hard ea966e943d9ebed47d290678c64c1c6709f452bc'
2024-12-10 00:42:22,381 [ scc.git] DEBUG HEAD is now at ea966e9 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-10 00:42:22,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:22,817 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-10 00:42:22,824 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-10 00:42:22,829 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/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
2024-12-10 00:42:22,834 [ scc.config] DEBUG Found github.token
2024-12-10 00:42:22,834 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-10 00:42:22,834 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-10 00:42:22,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:22,844 [ 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'
2024-12-10 00:42:22,915 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-10 00:42:22,916 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:22,921 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-10 00:42:22,921 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-10 00:42:23,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:23,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-10 00:42:23,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:23,221 [ 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'
2024-12-10 00:42:23,239 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-10 00:42:23,240 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:23,245 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-10 00:42:23,245 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-10 00:42:23,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:23,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-10 00:42:23,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:23,660 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-10 00:42:23,782 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-10 00:42:23,782 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-10 00:42:23,782 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:42:23,783 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:42:23,789 [ scc.git] DEBUG Calling 'git reset --hard df8c9ef0211ab2892da1b4860ee7ecfa62eb8ca4'
2024-12-10 00:42:23,796 [ scc.git] DEBUG HEAD is now at df8c9ef merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-10 00:42:23,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:24,001 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-10 00:42:24,007 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-10 00:42:24,013 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/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
2024-12-10 00:42:24,018 [ scc.config] DEBUG Found github.token
2024-12-10 00:42:24,018 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-10 00:42:24,786 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-10 00:42:24,788 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:24,834 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:24,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:24,840 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:24,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:24,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63673af40> has no local changes
2024-12-10 00:42:24,885 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:24,893 [ scc.git] DEBUG [detached HEAD 9e200cc] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:24,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:24,894 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:25,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-10 00:42:25,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-10 00:42:26,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-10 00:42:26,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-10 00:42:27,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-10 00:42:27,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-10 00:42:28,261 [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
2024-12-10 00:42:28,707 [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
2024-12-10 00:42:29,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-10 00:42:29,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:29,568 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-10 00:42:30,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-10 00:42:30,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-10 00:42:31,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-10 00:42:31,651 [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
2024-12-10 00:42:32,147 [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
2024-12-10 00:42:32,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-10 00:42:33,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:33,077 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-10 00:42:33,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-10 00:42:34,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-10 00:42:34,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-10 00:42:35,035 [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
2024-12-10 00:42:35,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-10 00:42:35,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:35,972 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-10 00:42:35,974 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:35,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-10 00:42:35,975 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:35,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:35,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:35,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:35,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:36,003 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:36,011 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:36,011 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-10 00:42:36,373 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-10 00:42:36,373 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-10 00:42:36,379 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-10 00:42:36,667 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-10 00:42:36,668 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-10 00:42:36,673 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-10 00:42:37,065 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-10 00:42:37,065 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-10 00:42:37,071 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:37,072 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:37,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:37,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-10 00:42:37,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:37,091 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-10 00:42:37,107 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-10 00:42:37,108 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:37,112 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-10 00:42:37,112 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-10 00:42:37,112 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-10 00:42:37,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:37,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-10 00:42:37,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:37,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-10 00:42:37,289 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-10 00:42:37,289 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-10 00:42:37,289 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-10 00:42:37,289 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-10 00:42:37,290 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:37,294 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-10 00:42:37,295 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-10 00:42:37,295 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-10 00:42:37,295 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-10 00:42:37,295 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-10 00:42:37,295 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-10 00:42:37,295 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-10 00:42:37,295 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-10 00:42:37,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:37,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-10 00:42:37,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:37,690 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-10 00:42:37,704 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-10 00:42:37,704 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:37,708 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-10 00:42:37,708 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-10 00:42:37,708 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-10 00:42:38,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:38,068 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:38,111 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:38,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:38,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:38,160 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:38,168 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc634697610> has no local changes
2024-12-10 00:42:38,168 [ 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'
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:38,177 [ scc.git] DEBUG [detached HEAD 39cd876] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:38,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:38,177 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:38,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-10 00:42:39,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-10 00:42:39,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-10 00:42:40,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-10 00:42:40,532 [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
2024-12-10 00:42:41,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-10 00:42:41,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:41,483 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-10 00:42:41,483 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:41,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-10 00:42:41,483 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:41,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:41,489 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:41,494 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:41,495 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:41,500 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:41,506 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:41,507 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-10 00:42:41,996 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-10 00:42:41,996 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-10 00:42:42,001 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:42,002 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:42,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:42,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-10 00:42:42,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:42,020 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-10 00:42:42,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:42,034 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-10 00:42:42,034 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-10 00:42:42,034 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-10 00:42:42,034 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-10 00:42:42,034 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-10 00:42:42,034 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-10 00:42:42,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:42,204 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:42,248 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:42,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:42,255 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:42,299 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:42,309 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6346a9bb0> has no local changes
2024-12-10 00:42:42,309 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:42,318 [ scc.git] DEBUG [detached HEAD cc42490] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:42,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:42,319 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:42,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-10 00:42:43,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-10 00:42:43,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-10 00:42:44,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-10 00:42:44,767 [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
2024-12-10 00:42:45,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-10 00:42:45,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:45,694 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-10 00:42:46,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-10 00:42:46,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-10 00:42:47,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-10 00:42:47,612 [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
2024-12-10 00:42:48,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-10 00:42:48,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:48,547 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-10 00:42:48,547 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:48,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-10 00:42:48,547 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:48,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:48,553 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:48,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:48,559 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:48,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:48,570 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:48,570 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-10 00:42:48,900 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-10 00:42:48,900 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-10 00:42:48,905 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-10 00:42:49,467 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-10 00:42:49,467 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-10 00:42:49,472 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:49,472 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:49,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:49,478 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-10 00:42:49,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:49,488 [ 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'
2024-12-10 00:42:49,541 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-10 00:42:49,541 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-10 00:42:49,541 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-10 00:42:49,541 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-10 00:42:49,541 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:42:49,542 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:42:49,547 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-10 00:42:49,554 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-10 00:42:49,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:49,716 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-10 00:42:49,723 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-10 00:42:49,729 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-12-10 00:42:49,733 [ scc.config] DEBUG Found github.token
2024-12-10 00:42:49,733 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-10 00:42:49,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-10 00:42:49,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:49,744 [ 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'
2024-12-10 00:42:49,761 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-10 00:42:49,761 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-10 00:42:49,761 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-10 00:42:49,761 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:42:49,761 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:42:49,767 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-10 00:42:49,774 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-10 00:42:50,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:50,105 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-10 00:42:50,113 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-10 00:42:50,118 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/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
2024-12-10 00:42:50,123 [ scc.config] DEBUG Found github.token
2024-12-10 00:42:50,123 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-10 00:42:50,123 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:50,159 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:50,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:50,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:50,205 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:50,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc634651880> has no local changes
2024-12-10 00:42:50,212 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:50,221 [ scc.git] DEBUG [detached HEAD 21a1c61] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:50,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:50,222 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:50,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-10 00:42:51,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-10 00:42:51,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-10 00:42:52,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-10 00:42:52,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-10 00:42:52,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-10 00:42:53,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-10 00:42:53,499 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:53,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-10 00:42:53,499 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:53,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:53,505 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:53,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:53,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:53,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:53,525 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:53,525 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:53,525 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:53,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:53,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:53,573 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:53,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:53,579 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:53,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:53,627 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc634651670> has no local changes
2024-12-10 00:42:53,627 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- 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.
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:53,636 [ scc.git] DEBUG [detached HEAD acd5702] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:53,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:53,637 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:54,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-12-10 00:42:54,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-12-10 00:42:55,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-12-10 00:42:55,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:42:56,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-10 00:42:56,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-12-10 00:42:57,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-10 00:42:57,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:42:58,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-10 00:42:58,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:42:58,535 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-12-10 00:42:58,536 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:42:58,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-10 00:42:58,536 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:58,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:58,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:42:58,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:42:58,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:42:58,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:42:58,560 [ scc.git] DEBUG Already up to date.
2024-12-10 00:42:58,560 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-10 00:42:58,870 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-12-10 00:42:58,870 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-10 00:42:58,875 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:42:58,875 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:58,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:58,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-10 00:42:58,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:58,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-10 00:42:58,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:42:59,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:42:59,066 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:42:59,108 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:42:59,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:42:59,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:42:59,158 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:42:59,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6346be8e0> has no local changes
2024-12-10 00:42:59,165 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:42:59,174 [ scc.git] DEBUG [detached HEAD 774e696] merge master -Dorg -Ssuccess-only
2024-12-10 00:42:59,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:42:59,175 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:42:59,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-10 00:43:00,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-12-10 00:43:00,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-10 00:43:01,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:43:01,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-10 00:43:02,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24?per_page=1 HTTP/1.1" 200 None
2024-12-10 00:43:02,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-10 00:43:03,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-12-10 00:43:03,068 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-12-10 00:43:03,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-10 00:43:03,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-10 00:43:04,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-10 00:43:05,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-10 00:43:05,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:43:05,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-10 00:43:06,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:06,340 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-10 00:43:06,340 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:06,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-10 00:43:06,341 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:06,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:06,347 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:06,352 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:06,352 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:06,357 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:06,364 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:06,364 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-10 00:43:06,804 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-10 00:43:06,804 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-10 00:43:06,809 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-12-10 00:43:07,334 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-10 00:43:07,334 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-12-10 00:43:07,340 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:07,340 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:07,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:07,346 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-10 00:43:07,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:07,359 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-10 00:43:07,369 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-10 00:43:07,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:07,372 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-10 00:43:07,372 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-10 00:43:07,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:07,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-10 00:43:07,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:07,523 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-10 00:43:07,546 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:07,549 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-10 00:43:07,549 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-10 00:43:07,549 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-12-10 00:43:07,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:07,907 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:07,949 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:07,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:07,954 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:07,996 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:08,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63467d730> has no local changes
2024-12-10 00:43:08,004 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:08,013 [ scc.git] DEBUG [detached HEAD a6acb3f] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:08,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:08,013 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:08,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-10 00:43:08,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-12-10 00:43:09,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-10 00:43:09,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:43:10,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-10 00:43:11,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-10 00:43:11,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:11,440 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-12-10 00:43:12,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-10 00:43:12,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-10 00:43:13,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-10 00:43:13,514 [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
2024-12-10 00:43:13,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-10 00:43:14,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:14,384 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-10 00:43:14,384 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:14,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-10 00:43:14,385 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:14,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:14,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:14,395 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:14,395 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:14,400 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:14,406 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:14,406 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-10 00:43:14,740 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-10 00:43:14,741 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-10 00:43:14,745 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-12-10 00:43:15,155 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-10 00:43:15,156 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-12-10 00:43:15,161 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:15,161 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:15,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:15,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-10 00:43:15,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:15,177 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-10 00:43:15,187 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG Auto-merging setup.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-10 00:43:15,188 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:43:15,188 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:43:15,193 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-10 00:43:15,199 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-12-10 00:43:15,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:15,366 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-10 00:43:15,373 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-10 00:43:15,379 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-12-10 00:43:15,385 [ scc.config] DEBUG Found github.token
2024-12-10 00:43:15,386 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-10 00:43:15,386 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-10 00:43:15,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:15,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-10 00:43:15,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:15,410 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-10 00:43:15,410 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-10 00:43:15,411 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-10 00:43:15,411 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-10 00:43:15,411 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-10 00:43:15,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:15,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:15,922 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:15,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:15,927 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:15,965 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:15,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63467d610> has no local changes
2024-12-10 00:43:15,971 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:15,979 [ scc.git] DEBUG [detached HEAD 13dba62] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:15,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:15,980 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:16,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-10 00:43:17,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-10 00:43:17,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-10 00:43:18,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-10 00:43:18,581 [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
2024-12-10 00:43:19,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-10 00:43:19,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:19,560 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-10 00:43:19,560 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:19,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-10 00:43:19,560 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:19,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:19,567 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:19,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:19,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:19,577 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:19,582 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:19,582 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-10 00:43:20,053 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-10 00:43:20,053 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-10 00:43:20,058 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:20,058 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:20,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-10 00:43:20,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,075 [ 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'
2024-12-10 00:43:20,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:20,172 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-10 00:43:20,173 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-10 00:43:20,175 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-10 00:43:20,175 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-10 00:43:20,175 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-10 00:43:20,175 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-10 00:43:20,175 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-10 00:43:20,175 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-10 00:43:20,176 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-10 00:43:20,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:20,321 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:20,364 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:20,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:20,412 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:20,420 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63467fc70> has no local changes
2024-12-10 00:43:20,420 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:20,429 [ scc.git] DEBUG [detached HEAD 5972fd6] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:20,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:20,430 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:20,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-10 00:43:20,764 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:20,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-10 00:43:20,764 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:20,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:20,775 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:20,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:20,781 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:20,787 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:20,787 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:20,787 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:20,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,791 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:20,832 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:20,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:20,838 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:20,879 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:20,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63468bca0> has no local changes
2024-12-10 00:43:20,886 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:20,895 [ scc.git] DEBUG [detached HEAD dd6ce18] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:20,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:20,896 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:21,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-10 00:43:21,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-10 00:43:22,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-10 00:43:22,862 [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
2024-12-10 00:43:23,541 [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
2024-12-10 00:43:23,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-10 00:43:24,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:24,386 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-10 00:43:24,387 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:24,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-10 00:43:24,387 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:24,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:24,393 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:24,397 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:24,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:24,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:24,407 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:24,407 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-10 00:43:24,994 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-10 00:43:24,994 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-10 00:43:24,999 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:24,999 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:24,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:25,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-10 00:43:25,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:25,014 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-10 00:43:25,083 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:25,086 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-10 00:43:25,086 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-10 00:43:25,086 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-10 00:43:25,086 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-10 00:43:25,086 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-10 00:43:25,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:25,221 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:25,263 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:25,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:25,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:25,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:25,317 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc634671f70> has no local changes
2024-12-10 00:43:25,317 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:25,325 [ scc.git] DEBUG [detached HEAD 02d7ebc] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:25,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:25,326 [ scc.git] INFO Overriding base-branch from master to main
2024-12-10 00:43:25,326 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:25,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-10 00:43:26,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-10 00:43:26,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-10 00:43:27,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-10 00:43:27,884 [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
2024-12-10 00:43:28,373 [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
2024-12-10 00:43:28,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-12-10 00:43:29,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-12-10 00:43:29,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-12-10 00:43:30,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-10 00:43:30,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-10 00:43:31,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-10 00:43:31,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-10 00:43:32,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-10 00:43:32,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-10 00:43:33,346 [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
2024-12-10 00:43:33,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-10 00:43:34,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:34,217 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-10 00:43:34,217 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:34,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-10 00:43:34,217 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:34,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:34,224 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-10 00:43:34,229 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:34,230 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-10 00:43:34,236 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-10 00:43:34,242 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:34,242 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-10 00:43:34,575 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-10 00:43:34,576 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-10 00:43:34,580 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:34,581 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:34,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:34,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-10 00:43:34,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:34,598 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-10 00:43:34,607 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-10 00:43:34,607 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-10 00:43:34,607 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:43:34,607 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:43:34,612 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-10 00:43:34,617 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-12-10 00:43:34,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:34,761 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-10 00:43:34,767 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-10 00:43:34,773 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-10 00:43:34,778 [ scc.config] DEBUG Found github.token
2024-12-10 00:43:34,778 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-10 00:43:34,778 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:34,816 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:34,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:34,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:34,861 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:34,867 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6345f0b50> has no local changes
2024-12-10 00:43:34,868 [ 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 17 jburel '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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:34,876 [ scc.git] DEBUG [detached HEAD 69965d0] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:34,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:34,877 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:35,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-10 00:43:35,188 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:35,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-10 00:43:35,189 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,195 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:35,200 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:35,200 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:35,205 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:35,210 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:35,210 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:35,210 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,214 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:35,270 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,275 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:35,317 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:35,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6345f0a60> has no local changes
2024-12-10 00:43:35,332 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:35,343 [ scc.git] DEBUG [detached HEAD bf3f384] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:35,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:35,344 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:35,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-10 00:43:35,607 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:35,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-10 00:43:35,607 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:35,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:35,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:35,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:35,628 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:35,628 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:35,628 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,633 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:35,672 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:35,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:35,677 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:35,713 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:35,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc634596970> has no local changes
2024-12-10 00:43:35,720 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:35,728 [ scc.git] DEBUG [detached HEAD 8efa274] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:35,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:35,728 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:36,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-10 00:43:36,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-10 00:43:37,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-10 00:43:37,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-10 00:43:38,098 [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
2024-12-10 00:43:38,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-10 00:43:38,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:38,926 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-10 00:43:38,926 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:38,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-10 00:43:38,926 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:38,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:38,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-10 00:43:38,937 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:38,937 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-10 00:43:38,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-10 00:43:38,946 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:38,947 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-10 00:43:39,282 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-10 00:43:39,282 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-10 00:43:39,287 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:39,287 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:39,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:39,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-10 00:43:39,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:39,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-10 00:43:39,375 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-10 00:43:39,375 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-10 00:43:39,375 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:43:39,375 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:43:39,381 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-10 00:43:39,388 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-10 00:43:39,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:39,549 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-10 00:43:39,556 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-10 00:43:39,562 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-10 00:43:39,566 [ scc.config] DEBUG Found github.token
2024-12-10 00:43:39,566 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-10 00:43:39,566 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:39,604 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:39,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:39,609 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:39,647 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:39,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6345965e0> has no local changes
2024-12-10 00:43:39,654 [ 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:39,663 [ scc.git] DEBUG [detached HEAD eddf207] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:39,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:39,663 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-10 00:43:39,663 [ scc.repo] DEBUG ## PRs found:
2024-12-10 00:43:40,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-10 00:43:40,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-10 00:43:41,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-10 00:43:41,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-10 00:43:42,135 [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
2024-12-10 00:43:42,573 [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
2024-12-10 00:43:43,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-10 00:43:43,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:43,503 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-10 00:43:43,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-10 00:43:44,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-10 00:43:45,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-10 00:43:45,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-12-10 00:43:46,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-12-10 00:43:46,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-10 00:43:46,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-10 00:43:47,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-10 00:43:47,985 [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
2024-12-10 00:43:48,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-10 00:43:48,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-10 00:43:48,966 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-10 00:43:49,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-10 00:43:50,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-10 00:43:50,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-10 00:43:51,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-10 00:43:51,243 [ scc.repo] DEBUG ## Branches found:
2024-12-10 00:43:51,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-10 00:43:51,243 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:51,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:51,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-10 00:43:51,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-10 00:43:51,256 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-10 00:43:51,262 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-10 00:43:51,269 [ scc.git] DEBUG Already up to date.
2024-12-10 00:43:51,269 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-10 00:43:51,598 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-10 00:43:51,599 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-10 00:43:51,603 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-10 00:43:51,922 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-10 00:43:51,923 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-10 00:43:51,927 [ scc.git] DEBUG ## Unique users: []
2024-12-10 00:43:51,927 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:51,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:51,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-10 00:43:51,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:51,943 [ 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'
2024-12-10 00:43:52,038 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-10 00:43:52,038 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-10 00:43:52,038 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-10 00:43:52,039 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-10 00:43:52,044 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-10 00:43:52,050 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-10 00:43:52,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:52,204 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-10 00:43:52,211 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-10 00:43:52,217 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#274](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-10 00:43:52,222 [ scc.config] DEBUG Found github.token
2024-12-10 00:43:52,222 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-10 00:43:52,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-10 00:43:52,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:52,232 [ 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'
2024-12-10 00:43:52,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-10 00:43:52,244 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-10 00:43:52,244 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-10 00:43:52,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:52,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-10 00:43:52,674 [ scc.git] DEBUG Get sha1 of %s
2024-12-10 00:43:52,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-10 00:43:52,680 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:52,721 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:43:52,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc63462af40> has no local changes
2024-12-10 00:43:52,729 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:43:52,738 [ scc.git] DEBUG [detached HEAD 9746e18] merge master -Dorg -Ssuccess-only
2024-12-10 00:43:52,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:43:52,739 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-10 00:43:52,824 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-10 00:43:53,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:53,033 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-10 00:43:53,039 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-10 00:43:53,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:53,425 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-10 00:43:53,429 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-10 00:43:53,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:53,831 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-10 00:43:53,837 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-10 00:43:54,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:54,233 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-10 00:43:54,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:54,628 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-10 00:43:54,634 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-10 00:43:55,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:55,014 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-10 00:43:55,019 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-10 00:43:55,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:55,399 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-10 00:43:55,404 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-10 00:43:55,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:55,789 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-10 00:43:55,794 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-10 00:43:56,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:56,183 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-10 00:43:56,187 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-10 00:43:56,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:56,572 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-10 00:43:56,576 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-10 00:43:56,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:56,965 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-10 00:43:56,969 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-10 00:43:57,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:57,368 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-10 00:43:57,372 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-10 00:43:57,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:57,781 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-10 00:43:58,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:58,180 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-10 00:43:58,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:58,591 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-10 00:43:58,596 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-10 00:43:58,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:59,014 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-10 00:43:59,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:59,426 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-10 00:43:59,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:43:59,819 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-10 00:43:59,826 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-10 00:44:00,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:44:00,207 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-10 00:44:00,212 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-10 00:44:00,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:44:00,613 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-10 00:44:00,617 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-10 00:44:01,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:44:01,015 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-10 00:44:01,019 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-10 00:44:01,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-10 00:44:01,422 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-10 00:44:01,423 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-10 00:44:01,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc639b5cee0> has local changes
2024-12-10 00:44:01,501 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
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 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 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 1dfb1389..d5050d8c
Previously merged:
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 603 will-moore 'Inset bugfixes'
Merged PRs:
- PR 602 will-moore 'Changelog 7.2.0'
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'
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 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.
Repository: ome/omero-prometheus-tools
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
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 17 jburel '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 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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#274 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/274/)'
2024-12-10 00:44:01,515 [ scc.git] DEBUG [detached HEAD c91154a] merge master -Dorg -Ssuccess-only
2024-12-10 00:44:01,515 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-10 00:44:01,516 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-10 00:44:01,516 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-10 00:44:01,516 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-10 00:44:01,516 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-10 00:44:01,516 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-10 00:44:01,516 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-10 00:44:01,516 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-10 00:44:01,516 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-10 00:44:01,516 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-10 00:44:01,516 [ scc.merge] INFO
2024-12-10 00:44:01,516 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,516 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-10 00:44:01,517 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-10 00:44:01,517 [ scc.merge] INFO Updating 1dfb1389..d5050d8c
2024-12-10 00:44:01,517 [ scc.merge] INFO Previously merged:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 603 will-moore 'Inset bugfixes'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 602 will-moore 'Changelog 7.2.0'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-10 00:44:01,517 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-10 00:44:01,517 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,517 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-10 00:44:01,517 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-10 00:44:01,517 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-10 00:44:01,517 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,517 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-10 00:44:01,518 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-10 00:44:01,518 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-10 00:44:01,518 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-10 00:44:01,518 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-10 00:44:01,518 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-10 00:44:01,518 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-12-10 00:44:01,518 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-12-10 00:44:01,518 [ scc.merge] INFO
2024-12-10 00:44:01,518 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-10 00:44:01,518 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,518 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-10 00:44:01,518 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-10 00:44:01,519 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-10 00:44:01,519 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-10 00:44:01,519 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-10 00:44:01,519 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-10 00:44:01,519 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-10 00:44:01,519 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,519 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-10 00:44:01,519 [ scc.merge] INFO
2024-12-10 00:44:01,519 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-10 00:44:01,520 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-10 00:44:01,520 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-10 00:44:01,520 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Repository: ome/scripts
2024-12-10 00:44:01,520 [ scc.merge] INFO Excluded PRs:
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-10 00:44:01,520 [ scc.merge] INFO Already up to date.
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Merged PRs:
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-10 00:44:01,520 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-10 00:44:01,520 [ scc.merge] INFO
2024-12-10 00:44:01,520 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-10 00:44:01,520 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-10 00:44:01,526 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-10 00:44:01,530 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-10 00:44:01,535 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-10 00:44:01,540 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-10 00:44:01,544 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-10 00:44:01,549 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-10 00:44:01,553 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-10 00:44:01,558 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-10 00:44:01,562 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-10 00:44:01,567 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-10 00:44:01,572 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-10 00:44:01,576 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-10 00:44:01,581 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-10 00:44:01,585 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-10 00:44:01,590 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-10 00:44:01,594 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-10 00:44:01,598 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-10 00:44:01,603 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-10 00:44:01,607 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-10 00:44:01,612 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-10 00:44:01,616 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-10 00:44:01,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-10 00:44:01,621 [ scc.git] DEBUG Calling 'git remote'
2024-12-10 00:44:01,625 [ 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 45e4238] 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 1dfb1389
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 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
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 67bb245
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 312afbe
nothing to commit, working tree clean
[detached HEAD fc826e3] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-10 00:44:48,335 [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
2024-12-10 00:44:57,494 [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
2024-12-10 00:44:59,880 [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
2024-12-10 00:45:04,926 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-10 00:45:48,328 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/28c89a1b/images/svgs/logo.svg){kind=logo}
