Skipping 106 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-18 00:55:30,229 [ scc.git] DEBUG create mode 100644 src/templates/colorbar.template.html
2025-01-18 00:55:30,229 [ scc.git] DEBUG create mode 100644 src/templates/colorbar_form.template.html
2025-01-18 00:55:30,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:30,360 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:55:30,403 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:30,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:30,409 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:55:30,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:55:30,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f5c38580> has no local changes
2025-01-18 00:55:30,463 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:55:30,476 [ scc.git] DEBUG [detached HEAD 9e502484] merge master -Dorg -Ssuccess-only
2025-01-18 00:55:30,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:55:30,477 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:55:30,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-18 00:55:31,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-18 00:55:31,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-18 00:55:32,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-18 00:55:32,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:33,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-18 00:55:33,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:33,738 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-18 00:55:33,738 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:55:33,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-18 00:55:33,739 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:33,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:33,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:55:33,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:55:33,752 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:55:33,758 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:55:33,766 [ scc.git] DEBUG Already up to date.
2025-01-18 00:55:33,766 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-18 00:55:34,271 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-18 00:55:34,271 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-18 00:55:34,276 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:55:34,276 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:34,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:34,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-18 00:55:34,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:34,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-18 00:55:34,348 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-18 00:55:34,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:55:34,352 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-18 00:55:34,353 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-18 00:55:34,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:34,493 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:55:34,536 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:34,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:34,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:55:34,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:55:34,593 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f5c32e20> has no local changes
2025-01-18 00:55:34,594 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:55:34,603 [ scc.git] DEBUG [detached HEAD 6da76c5] merge master -Dorg -Ssuccess-only
2025-01-18 00:55:34,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:55:34,604 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:55:35,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-18 00:55:35,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-18 00:55:36,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-18 00:55:36,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-18 00:55:36,503 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:37,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-18 00:55:37,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:38,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:38,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-18 00:55:38,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:38,949 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-18 00:55:39,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-18 00:55:39,387 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:39,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-18 00:55:40,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:41,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:42,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-18 00:55:42,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:42,440 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-18 00:55:42,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-18 00:55:42,886 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:43,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-18 00:55:43,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:44,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:44,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-18 00:55:45,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:45,386 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-18 00:55:45,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-18 00:55:46,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-18 00:55:46,251 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:46,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-18 00:55:47,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:47,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:48,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-18 00:55:48,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:48,767 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-18 00:55:49,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-18 00:55:49,220 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:49,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-18 00:55:50,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:50,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:51,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-18 00:55:51,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:51,776 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-18 00:55:52,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-18 00:55:52,228 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:55:52,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-18 00:55:53,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:55:53,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:55:54,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-18 00:55:54,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:55:54,696 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-18 00:55:54,696 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:55:54,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-18 00:55:54,696 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:54,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:54,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:55:54,708 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:55:54,708 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:55:54,714 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:55:54,720 [ scc.git] DEBUG Already up to date.
2025-01-18 00:55:54,720 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-18 00:55:55,034 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:55,035 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-18 00:55:55,039 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-18 00:55:55,343 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:55,343 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-18 00:55:55,348 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-18 00:55:55,636 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:55,636 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-18 00:55:55,642 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-18 00:55:55,931 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:55,932 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-18 00:55:55,937 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-18 00:55:56,221 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:56,221 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-18 00:55:56,226 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-18 00:55:56,515 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-18 00:55:56,515 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-18 00:55:56,520 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:55:56,520 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:56,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:56,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-18 00:55:56,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:56,552 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-18 00:55:56,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:55:56,654 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-18 00:55:56,654 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-18 00:55:56,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:56,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-18 00:55:56,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:56,888 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-18 00:55:57,025 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-18 00:55:57,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:55:57,033 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-18 00:55:57,033 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-18 00:55:57,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:57,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-18 00:55:57,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:57,244 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-18 00:55:57,378 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-18 00:55:57,378 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-18 00:55:57,378 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:55:57,379 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:55:57,385 [ scc.git] DEBUG Calling 'git reset --hard 114c4d94d84c2fdea6dcaa8cbb6d06eac0626ae5'
2025-01-18 00:55:57,393 [ scc.git] DEBUG HEAD is now at 114c4d9 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-18 00:55:57,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:57,594 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-18 00:55:57,600 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-18 00:55:57,606 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-18 00:55:57,612 [ scc.config] DEBUG Found github.token
2025-01-18 00:55:57,612 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-18 00:55:57,612 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-18 00:55:57,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:57,625 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-18 00:55:57,686 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-18 00:55:57,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:55:57,692 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-18 00:55:57,692 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-18 00:55:57,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:57,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-18 00:55:58,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:58,043 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-18 00:55:58,086 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-18 00:55:58,087 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:55:58,092 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-18 00:55:58,092 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-18 00:55:58,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:58,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-18 00:55:58,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:58,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-18 00:55:58,502 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-18 00:55:58,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-18 00:55:58,503 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:55:58,503 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:55:58,509 [ scc.git] DEBUG Calling 'git reset --hard c9c196526aeb933dfb91aa9ec0eac049992dacfe'
2025-01-18 00:55:58,517 [ scc.git] DEBUG HEAD is now at c9c1965 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-18 00:55:58,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:55:58,768 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-18 00:55:58,774 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-18 00:55:58,779 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-18 00:55:58,784 [ scc.config] DEBUG Found github.token
2025-01-18 00:55:58,784 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-18 00:55:58,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:55:58,874 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:55:58,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:55:58,881 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:55:58,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:55:58,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f5c24b20> has no local changes
2025-01-18 00:55:58,933 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:55:58,943 [ scc.git] DEBUG [detached HEAD a70fd6a] merge master -Dorg -Ssuccess-only
2025-01-18 00:55:58,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:55:58,943 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:55:59,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-18 00:55:59,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-18 00:56:00,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-18 00:56:00,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-18 00:56:01,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:01,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:02,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-18 00:56:02,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:02,872 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-18 00:56:03,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-18 00:56:03,359 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-18 00:56:03,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-18 00:56:04,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:05,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:05,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-18 00:56:06,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:06,129 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-18 00:56:06,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-18 00:56:07,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-18 00:56:07,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-18 00:56:08,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-18 00:56:08,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-18 00:56:09,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:09,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:10,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-18 00:56:10,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:10,875 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-18 00:56:11,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-18 00:56:11,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-18 00:56:12,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-18 00:56:12,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:13,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:14,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-18 00:56:14,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:14,436 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-18 00:56:14,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-18 00:56:15,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-18 00:56:15,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-18 00:56:16,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:16,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-18 00:56:17,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:17,263 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-18 00:56:17,263 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:17,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-18 00:56:17,263 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:17,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:17,270 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:17,275 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:17,275 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:17,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:17,290 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:17,290 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-18 00:56:19,396 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-18 00:56:19,396 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-18 00:56:19,402 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-18 00:56:20,938 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-18 00:56:20,938 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-18 00:56:20,944 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-18 00:56:21,375 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-18 00:56:21,375 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-18 00:56:21,380 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-18 00:56:21,687 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-18 00:56:21,687 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-18 00:56:21,692 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-18 00:56:22,520 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-18 00:56:22,521 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-18 00:56:22,526 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:22,527 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:22,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:22,534 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-18 00:56:22,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:22,547 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-18 00:56:22,719 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-18 00:56:22,719 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:22,723 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-18 00:56:22,723 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-18 00:56:22,723 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-18 00:56:22,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:22,871 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-18 00:56:22,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:22,885 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-18 00:56:23,384 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-18 00:56:23,384 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-18 00:56:23,384 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-18 00:56:23,384 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-18 00:56:23,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:23,390 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-18 00:56:23,390 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-18 00:56:23,390 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-18 00:56:23,390 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-18 00:56:23,390 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-18 00:56:23,390 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-18 00:56:23,390 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-18 00:56:23,390 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-18 00:56:23,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:23,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-18 00:56:23,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:23,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-18 00:56:23,699 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-18 00:56:23,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:23,704 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-18 00:56:23,704 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-18 00:56:23,704 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-18 00:56:23,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:23,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-18 00:56:24,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:24,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-18 00:56:24,186 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:24,198 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-18 00:56:24,198 [ scc.git] DEBUG package.json | 2 +-
2025-01-18 00:56:24,198 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-18 00:56:24,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:24,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-18 00:56:24,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:24,345 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-18 00:56:24,813 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-18 00:56:24,813 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-18 00:56:24,814 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-18 00:56:24,814 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-18 00:56:24,814 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-18 00:56:24,814 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:24,819 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-18 00:56:24,819 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-18 00:56:24,819 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-18 00:56:24,819 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-18 00:56:24,820 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-18 00:56:24,820 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-18 00:56:24,820 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-18 00:56:24,820 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-18 00:56:24,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:24,947 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:24,988 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:24,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:24,993 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:25,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:25,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f5bfbe80> has no local changes
2025-01-18 00:56:25,044 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:25,055 [ scc.git] DEBUG [detached HEAD 1911eca] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:25,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:25,055 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:25,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-18 00:56:25,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-18 00:56:26,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-18 00:56:26,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-18 00:56:27,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:27,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-18 00:56:28,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:28,277 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-18 00:56:28,277 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:28,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-18 00:56:28,278 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:28,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:28,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:28,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:28,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:28,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:28,301 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:28,301 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-18 00:56:29,246 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-18 00:56:29,247 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-18 00:56:29,251 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:29,251 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:29,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:29,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-18 00:56:29,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:29,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-18 00:56:29,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:29,283 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-18 00:56:29,283 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-18 00:56:29,283 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-18 00:56:29,283 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-18 00:56:29,283 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-18 00:56:29,283 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-18 00:56:29,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:29,432 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:29,480 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:29,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:29,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:29,531 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:29,539 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f43b85b0> has no local changes
2025-01-18 00:56:29,540 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:29,550 [ scc.git] DEBUG [detached HEAD 2ea8866] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:29,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:29,551 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:29,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-18 00:56:30,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-18 00:56:30,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-18 00:56:31,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-18 00:56:31,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:32,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-18 00:56:32,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:32,799 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-18 00:56:33,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-18 00:56:33,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-18 00:56:34,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-18 00:56:34,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:35,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-18 00:56:35,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:35,604 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-18 00:56:35,604 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:35,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-18 00:56:35,604 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:35,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:35,610 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:35,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:35,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:35,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:35,626 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:35,626 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-18 00:56:36,619 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-18 00:56:36,620 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-18 00:56:36,625 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-18 00:56:37,432 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-18 00:56:37,433 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-18 00:56:37,438 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:37,438 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:37,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:37,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-18 00:56:37,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:37,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-18 00:56:37,660 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-18 00:56:37,661 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-18 00:56:37,661 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-18 00:56:37,661 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-18 00:56:37,661 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:56:37,662 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:56:37,670 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-18 00:56:37,678 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-18 00:56:37,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:37,815 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-18 00:56:37,822 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-18 00:56:37,913 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-18 00:56:37,919 [ scc.config] DEBUG Found github.token
2025-01-18 00:56:37,919 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-18 00:56:37,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-18 00:56:37,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:37,935 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-18 00:56:38,156 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-18 00:56:38,157 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-18 00:56:38,157 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-18 00:56:38,157 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:56:38,158 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:56:38,166 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-18 00:56:38,176 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-18 00:56:38,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:38,318 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-18 00:56:38,326 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-18 00:56:38,332 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-01-18 00:56:38,337 [ scc.config] DEBUG Found github.token
2025-01-18 00:56:38,338 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-18 00:56:38,338 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:38,376 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:38,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:38,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:38,421 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:38,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f43cbb80> has no local changes
2025-01-18 00:56:38,429 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:38,439 [ scc.git] DEBUG [detached HEAD 2cc8f40] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:38,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:38,440 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:38,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-18 00:56:39,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-18 00:56:39,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-18 00:56:40,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-18 00:56:40,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-18 00:56:41,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-18 00:56:41,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-18 00:56:42,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-18 00:56:42,117 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:42,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-18 00:56:42,117 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:42,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:42,129 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:42,135 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:42,141 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:42,142 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:42,142 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,149 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:42,191 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:42,239 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:42,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f439cf40> has no local changes
2025-01-18 00:56:42,246 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:42,255 [ scc.git] DEBUG [detached HEAD 3804960] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:42,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:42,255 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:42,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-18 00:56:42,536 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:42,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-18 00:56:42,536 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,543 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:42,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:42,549 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:42,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:42,561 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:42,561 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:42,561 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,566 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:42,608 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:42,656 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:42,662 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f436f940> has no local changes
2025-01-18 00:56:42,663 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:42,671 [ scc.git] DEBUG [detached HEAD 296cd5b] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:42,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:42,672 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:42,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-18 00:56:42,941 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:42,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-18 00:56:42,941 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,947 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:42,953 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:42,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:42,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:42,966 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:42,966 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:42,966 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:42,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:42,972 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:43,017 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:43,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:43,023 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:43,066 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:43,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f43295e0> has no local changes
2025-01-18 00:56:43,073 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:43,083 [ scc.git] DEBUG [detached HEAD e2ba2a8] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:43,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:43,083 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:43,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-18 00:56:43,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-18 00:56:44,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-18 00:56:44,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-18 00:56:45,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:45,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-18 00:56:46,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:46,307 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-18 00:56:46,307 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:46,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-18 00:56:46,307 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:46,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:46,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:46,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:46,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:46,324 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:46,331 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:46,331 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-18 00:56:46,667 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-18 00:56:46,667 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-18 00:56:46,672 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:46,672 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:46,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:46,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-18 00:56:46,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:46,690 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-18 00:56:46,818 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG Auto-merging setup.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-18 00:56:46,818 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:56:46,818 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:56:46,825 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-18 00:56:46,832 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-18 00:56:46,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:46,967 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-18 00:56:46,974 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-18 00:56:47,071 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-01-18 00:56:47,077 [ scc.config] DEBUG Found github.token
2025-01-18 00:56:47,077 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-18 00:56:47,077 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:47,120 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:47,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:47,126 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:47,171 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:47,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f43297f0> has no local changes
2025-01-18 00:56:47,179 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:47,189 [ scc.git] DEBUG [detached HEAD b652fa7] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:47,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:47,190 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:47,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-18 00:56:47,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-18 00:56:48,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-18 00:56:49,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-18 00:56:49,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:50,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:50,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-18 00:56:50,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-18 00:56:51,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-18 00:56:51,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-18 00:56:52,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-18 00:56:52,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:53,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-18 00:56:53,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:53,712 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-18 00:56:53,712 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:53,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-18 00:56:53,713 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:53,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:53,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:53,724 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:53,725 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:53,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:53,736 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:53,736 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-18 00:56:54,169 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-18 00:56:54,169 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-18 00:56:54,174 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:54,174 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:54,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,180 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-18 00:56:54,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-01-18 00:56:54,216 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-18 00:56:54,220 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-18 00:56:54,222 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-18 00:56:54,223 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-18 00:56:54,223 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-18 00:56:54,224 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-18 00:56:54,224 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-18 00:56:54,224 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-18 00:56:54,224 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-18 00:56:54,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:54,379 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:54,421 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:54,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,426 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:54,466 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:54,473 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f4329640> has no local changes
2025-01-18 00:56:54,474 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:54,484 [ scc.git] DEBUG [detached HEAD 2263dbf] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:54,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:54,484 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:54,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-18 00:56:54,810 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:54,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-18 00:56:54,811 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:54,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:54,822 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:54,822 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:54,828 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:54,835 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:54,835 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:54,835 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:54,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,841 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:54,880 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:54,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:54,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:54,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:54,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f438c550> has no local changes
2025-01-18 00:56:54,936 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:54,944 [ scc.git] DEBUG [detached HEAD 298aca9] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:54,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:54,944 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:55,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-18 00:56:55,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-18 00:56:56,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-18 00:56:56,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-18 00:56:57,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:56:57,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:56:58,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-18 00:56:58,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:56:58,523 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-18 00:56:58,523 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:56:58,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-18 00:56:58,523 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:58,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:58,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:56:58,533 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:56:58,534 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:56:58,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:56:58,544 [ scc.git] DEBUG Already up to date.
2025-01-18 00:56:58,544 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-18 00:56:59,255 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-18 00:56:59,255 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-18 00:56:59,259 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:56:59,259 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:59,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:59,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-18 00:56:59,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:59,275 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-18 00:56:59,325 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:56:59,327 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-18 00:56:59,328 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-18 00:56:59,328 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-18 00:56:59,328 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-18 00:56:59,328 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-18 00:56:59,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:56:59,459 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:56:59,502 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:56:59,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:56:59,508 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:56:59,550 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:56:59,557 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f438c790> has no local changes
2025-01-18 00:56:59,557 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:56:59,566 [ scc.git] DEBUG [detached HEAD 6fc892d] merge master -Dorg -Ssuccess-only
2025-01-18 00:56:59,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:56:59,567 [ scc.git] INFO Overriding base-branch from master to main
2025-01-18 00:56:59,567 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:56:59,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-18 00:57:00,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-18 00:57:00,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-18 00:57:01,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-18 00:57:01,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:57:02,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:57:02,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-18 00:57:03,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-18 00:57:03,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-18 00:57:04,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-18 00:57:04,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:57:05,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-18 00:57:05,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:57:05,668 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-18 00:57:05,669 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:57:05,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-18 00:57:05,669 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:05,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:05,675 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-18 00:57:05,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:57:05,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-18 00:57:05,688 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-18 00:57:05,694 [ scc.git] DEBUG Already up to date.
2025-01-18 00:57:05,695 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-18 00:57:06,147 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-18 00:57:06,147 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-18 00:57:06,152 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:57:06,152 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:06,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-18 00:57:06,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,168 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-18 00:57:06,326 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-18 00:57:06,326 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-18 00:57:06,326 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:57:06,326 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:57:06,333 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-18 00:57:06,339 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-18 00:57:06,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:06,481 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-18 00:57:06,488 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-18 00:57:06,493 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-18 00:57:06,498 [ scc.config] DEBUG Found github.token
2025-01-18 00:57:06,499 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-18 00:57:06,499 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:57:06,540 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:06,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:06,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:06,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f4301580> has no local changes
2025-01-18 00:57:06,592 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:06,602 [ scc.git] DEBUG [detached HEAD 044c8c4] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:06,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:06,602 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:57:06,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-18 00:57:06,888 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:57:06,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-18 00:57:06,888 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:06,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,894 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:57:06,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:57:06,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:57:06,905 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:57:06,910 [ scc.git] DEBUG Already up to date.
2025-01-18 00:57:06,910 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:57:06,910 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:06,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,915 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:57:06,955 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:06,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:06,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:07,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:07,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f43014f0> has no local changes
2025-01-18 00:57:07,011 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:07,019 [ scc.git] DEBUG [detached HEAD 595291a] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:07,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:07,020 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:57:07,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-18 00:57:07,326 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:57:07,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-18 00:57:07,326 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:07,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:07,333 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:57:07,339 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:57:07,339 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:57:07,345 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:57:07,351 [ scc.git] DEBUG Already up to date.
2025-01-18 00:57:07,352 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:57:07,352 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:07,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:07,357 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:57:07,399 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:07,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:07,405 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:07,449 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:07,456 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f4312bb0> has no local changes
2025-01-18 00:57:07,456 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:07,465 [ scc.git] DEBUG [detached HEAD 55a6fd5] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:07,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:07,466 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:57:07,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-18 00:57:08,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-18 00:57:08,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-18 00:57:09,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-18 00:57:10,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:57:10,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-18 00:57:10,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:57:10,953 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-18 00:57:10,954 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:57:10,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-18 00:57:10,954 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:10,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:10,960 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-18 00:57:10,965 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:57:10,965 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-18 00:57:10,971 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-18 00:57:10,978 [ scc.git] DEBUG Already up to date.
2025-01-18 00:57:10,978 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-18 00:57:11,382 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-18 00:57:11,382 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-18 00:57:11,387 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:57:11,388 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:11,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:11,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-18 00:57:11,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:11,405 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-18 00:57:11,558 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-18 00:57:11,558 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-18 00:57:11,558 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:57:11,559 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:57:11,565 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-18 00:57:11,573 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-18 00:57:11,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:11,719 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-18 00:57:11,726 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-18 00:57:11,732 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-18 00:57:11,738 [ scc.config] DEBUG Found github.token
2025-01-18 00:57:11,738 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-18 00:57:11,738 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:57:11,779 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:11,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:11,785 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:11,825 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:11,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f42b8a30> has no local changes
2025-01-18 00:57:11,832 [ 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:11,841 [ scc.git] DEBUG [detached HEAD ef3fea3] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:11,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:11,842 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-18 00:57:11,842 [ scc.repo] DEBUG ## PRs found:
2025-01-18 00:57:12,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-18 00:57:12,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-18 00:57:13,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-18 00:57:13,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-18 00:57:14,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:57:14,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-18 00:57:15,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-18 00:57:15,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:57:15,528 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-18 00:57:15,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-18 00:57:16,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-18 00:57:16,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-18 00:57:17,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-18 00:57:17,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-18 00:57:18,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-18 00:57:18,222 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-18 00:57:18,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-18 00:57:19,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-18 00:57:19,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-18 00:57:20,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-18 00:57:20,103 [ scc.repo] DEBUG ## Branches found:
2025-01-18 00:57:20,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-18 00:57:20,103 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:20,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:20,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-18 00:57:20,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-18 00:57:20,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-18 00:57:20,120 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-18 00:57:20,128 [ scc.git] DEBUG Already up to date.
2025-01-18 00:57:20,128 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-18 00:57:20,641 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-18 00:57:20,642 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-18 00:57:20,647 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-18 00:57:21,477 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-18 00:57:21,477 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-18 00:57:21,481 [ scc.git] DEBUG ## Unique users: []
2025-01-18 00:57:21,481 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:21,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:21,487 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-18 00:57:21,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:21,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-18 00:57:21,542 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-18 00:57:21,543 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-18 00:57:21,543 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-18 00:57:21,549 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-18 00:57:21,556 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-18 00:57:21,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:21,702 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-18 00:57:21,710 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-18 00:57:21,716 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#309](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-18 00:57:21,721 [ scc.config] DEBUG Found github.token
2025-01-18 00:57:21,721 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-18 00:57:21,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-18 00:57:21,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:21,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-18 00:57:21,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-18 00:57:21,764 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-18 00:57:21,764 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-18 00:57:22,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:22,099 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-18 00:57:22,142 [ scc.git] DEBUG Get sha1 of %s
2025-01-18 00:57:22,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-18 00:57:22,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:22,189 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:22,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f42b8670> has no local changes
2025-01-18 00:57:22,197 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:22,207 [ scc.git] DEBUG [detached HEAD d7776a3] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:22,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:22,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-18 00:57:22,286 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-18 00:57:22,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:22,566 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-18 00:57:22,571 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-18 00:57:22,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:22,953 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-18 00:57:22,958 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-18 00:57:23,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:23,344 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-18 00:57:23,350 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-18 00:57:23,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:23,736 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-18 00:57:24,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:24,126 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-18 00:57:24,132 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-18 00:57:24,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:24,503 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-18 00:57:24,509 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-18 00:57:24,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:24,928 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-18 00:57:24,933 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-18 00:57:25,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:25,323 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-18 00:57:25,329 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-18 00:57:25,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:25,729 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-18 00:57:25,733 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-18 00:57:26,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:26,130 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-18 00:57:26,135 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-18 00:57:26,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:26,508 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-18 00:57:26,513 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-18 00:57:26,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:26,901 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-18 00:57:26,906 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-18 00:57:27,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:27,297 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-18 00:57:27,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:27,684 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-18 00:57:28,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:28,067 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-18 00:57:28,074 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-18 00:57:28,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:28,485 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-18 00:57:28,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:28,900 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-18 00:57:29,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:29,289 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-18 00:57:29,295 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-18 00:57:29,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:29,678 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-18 00:57:29,684 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-18 00:57:30,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:30,081 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-18 00:57:30,087 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-18 00:57:30,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:30,463 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-18 00:57:30,468 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-18 00:57:30,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-18 00:57:30,857 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-18 00:57:30,858 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-18 00:57:30,944 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0f6d06370> has local changes
2025-01-18 00:57:30,945 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#309 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/309/)'
2025-01-18 00:57:30,959 [ scc.git] DEBUG [detached HEAD dad12d1] merge master -Dorg -Ssuccess-only
2025-01-18 00:57:30,960 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-18 00:57:30,960 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-18 00:57:30,960 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,960 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-18 00:57:30,960 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-18 00:57:30,960 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-18 00:57:30,960 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,960 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-18 00:57:30,960 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO
2025-01-18 00:57:30,960 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-18 00:57:30,960 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,960 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-18 00:57:30,961 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-18 00:57:30,961 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-18 00:57:30,961 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-18 00:57:30,961 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-18 00:57:30,961 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-18 00:57:30,961 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-18 00:57:30,961 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,961 [ scc.merge] INFO
2025-01-18 00:57:30,961 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,961 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-18 00:57:30,962 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-18 00:57:30,962 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-18 00:57:30,962 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-18 00:57:30,962 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,962 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-18 00:57:30,962 [ scc.merge] INFO
2025-01-18 00:57:30,962 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-18 00:57:30,963 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,963 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,963 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-18 00:57:30,963 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-18 00:57:30,963 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-18 00:57:30,963 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,963 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-18 00:57:30,963 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,963 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-18 00:57:30,964 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,964 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-18 00:57:30,964 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,964 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,964 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-18 00:57:30,964 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-18 00:57:30,964 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,964 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-18 00:57:30,964 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-18 00:57:30,964 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-18 00:57:30,964 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,964 [ scc.merge] INFO
2025-01-18 00:57:30,964 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,965 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-18 00:57:30,965 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-18 00:57:30,965 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,965 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-18 00:57:30,965 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,965 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-18 00:57:30,965 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-18 00:57:30,965 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,965 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-18 00:57:30,965 [ scc.merge] INFO
2025-01-18 00:57:30,965 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-18 00:57:30,966 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,966 [ scc.merge] INFO
2025-01-18 00:57:30,966 [ scc.merge] INFO
2025-01-18 00:57:30,966 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-18 00:57:30,966 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,966 [ scc.merge] INFO
2025-01-18 00:57:30,966 [ scc.merge] INFO
2025-01-18 00:57:30,966 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-18 00:57:30,966 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,966 [ scc.merge] INFO
2025-01-18 00:57:30,966 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,966 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-18 00:57:30,967 [ scc.merge] INFO
2025-01-18 00:57:30,967 [ scc.merge] INFO Repository: ome/scripts
2025-01-18 00:57:30,967 [ scc.merge] INFO Excluded PRs:
2025-01-18 00:57:30,967 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-18 00:57:30,967 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-18 00:57:30,967 [ scc.merge] INFO Already up to date.
2025-01-18 00:57:30,967 [ scc.merge] INFO
2025-01-18 00:57:30,967 [ scc.merge] INFO Merged PRs:
2025-01-18 00:57:30,967 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-18 00:57:30,967 [ scc.merge] INFO
2025-01-18 00:57:30,967 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-18 00:57:30,967 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-18 00:57:30,967 [ scc.merge] INFO
2025-01-18 00:57:30,967 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-18 00:57:30,967 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:30,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-18 00:57:30,976 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:30,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:30,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-18 00:57:30,982 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:30,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:30,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-18 00:57:30,989 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:30,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:30,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-18 00:57:30,995 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-18 00:57:31,000 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-18 00:57:31,006 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-18 00:57:31,012 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-18 00:57:31,018 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-18 00:57:31,024 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-18 00:57:31,029 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-18 00:57:31,034 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-18 00:57:31,040 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-18 00:57:31,046 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-18 00:57:31,053 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-18 00:57:31,058 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-18 00:57:31,064 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-18 00:57:31,070 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-18 00:57:31,077 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-18 00:57:31,082 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-18 00:57:31,088 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-18 00:57:31,093 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-18 00:57:31,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-18 00:57:31,099 [ scc.git] DEBUG Calling 'git remote'
2025-01-18 00:57:31,104 [ 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 1f9adb3] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from a80640a9
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD f8acccd] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-18 00:58:20,868 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-01-18 00:58:29,656 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-01-18 00:58:32,050 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-18 00:58:36,712 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-18 00:59:16,912 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
