Console Output
Skipping 114 KB..
Full Log scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:42:50,993 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4f2fb50> has no local changes
2024-09-25 00:42:50,993 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
- PR 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute' (status: action_required)
- PR 588 dependabot[bot] 'Bump dompurify from 2.4.3 to 2.5.4' (status: failure)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
- PR 587 will-moore 'Update licenses.txt'
- PR 590 dependabot[bot] 'Bump vite from 3.2.10 to 3.2.11'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:42:51,012 [ scc.git] DEBUG [detached HEAD 7f100697] merge master -Dorg -Ssuccess-only
2024-09-25 00:42:51,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:42:51,014 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:42:51,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-25 00:42:51,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-25 00:42:52,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-25 00:42:52,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-25 00:42:53,284 [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
2024-09-25 00:42:53,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-25 00:42:54,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:42:54,224 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-25 00:42:54,224 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:42:54,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-25 00:42:54,224 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:54,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:54,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:42:54,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:42:54,235 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:42:54,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:42:54,248 [ scc.git] DEBUG Already up to date.
2024-09-25 00:42:54,249 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-25 00:42:54,565 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-25 00:42:54,565 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-25 00:42:54,569 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:42:54,569 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:54,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:54,574 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-25 00:42:54,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:54,584 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-25 00:42:54,614 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-25 00:42:54,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:42:54,617 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-25 00:42:54,617 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-25 00:42:54,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:42:54,757 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:42:54,794 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:54,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:54,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:42:54,836 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:42:54,842 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4f3cdc0> has no local changes
2024-09-25 00:42:54,843 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:42:54,851 [ scc.git] DEBUG [detached HEAD 4bd00b0] merge master -Dorg -Ssuccess-only
2024-09-25 00:42:54,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:42:54,852 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:42:55,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-25 00:42:55,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-25 00:42:55,694 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:42:56,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-25 00:42:56,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:42:57,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:42:57,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-25 00:42:58,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:42:58,284 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-25 00:42:58,284 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:42:58,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-25 00:42:58,284 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:58,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:58,290 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:42:58,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:42:58,295 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:42:58,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:42:58,306 [ scc.git] DEBUG Already up to date.
2024-09-25 00:42:58,307 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-25 00:42:58,651 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-25 00:42:58,652 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-25 00:42:58,657 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:42:58,657 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:58,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:58,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-25 00:42:58,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:58,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-25 00:42:58,683 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:42:58,687 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-25 00:42:58,687 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-25 00:42:58,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:42:58,820 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:42:58,860 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:42:58,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:42:58,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:42:58,902 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:42:58,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4f34790> has no local changes
2024-09-25 00:42:58,909 [ 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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:42:58,920 [ scc.git] DEBUG [detached HEAD 6022d74] merge master -Dorg -Ssuccess-only
2024-09-25 00:42:58,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:42:58,920 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:42:59,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-25 00:42:59,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-25 00:42:59,894 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:00,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-25 00:43:01,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:01,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:02,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-25 00:43:02,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:02,519 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-25 00:43:02,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-25 00:43:03,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-25 00:43:03,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-25 00:43:04,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:04,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:05,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-25 00:43:05,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:05,706 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-25 00:43:06,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-25 00:43:06,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-25 00:43:06,618 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:07,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-25 00:43:07,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:08,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:08,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-25 00:43:09,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:09,331 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-25 00:43:09,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-25 00:43:09,802 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:10,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-25 00:43:10,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:11,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:11,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-25 00:43:12,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:12,281 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-25 00:43:12,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-25 00:43:13,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-25 00:43:13,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-25 00:43:14,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:14,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:15,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-25 00:43:15,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:15,603 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-25 00:43:16,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-25 00:43:16,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-25 00:43:17,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-25 00:43:17,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:18,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:18,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-25 00:43:19,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:19,124 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-25 00:43:19,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-25 00:43:20,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-25 00:43:20,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-25 00:43:20,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:21,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-25 00:43:21,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:21,860 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-25 00:43:21,860 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:43:21,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-25 00:43:21,860 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:21,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:21,866 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:43:21,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:43:21,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:43:21,907 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:43:21,914 [ scc.git] DEBUG Already up to date.
2024-09-25 00:43:21,914 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-25 00:43:22,434 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:22,435 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-25 00:43:22,440 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-25 00:43:23,296 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:23,296 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-25 00:43:23,301 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-25 00:43:23,706 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:23,706 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-25 00:43:23,711 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-25 00:43:24,000 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:24,000 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-25 00:43:24,009 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-25 00:43:24,328 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:24,328 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-25 00:43:24,333 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-25 00:43:24,703 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:24,703 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-25 00:43:24,709 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-25 00:43:24,995 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-25 00:43:24,996 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-25 00:43:25,004 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:43:25,004 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:25,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:25,014 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-25 00:43:25,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:25,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-25 00:43:25,111 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-25 00:43:25,113 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:25,118 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-25 00:43:25,118 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-25 00:43:25,119 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-25 00:43:25,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:25,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-25 00:43:25,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:25,317 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-25 00:43:25,462 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-25 00:43:25,462 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-25 00:43:25,462 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-25 00:43:25,462 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-25 00:43:25,463 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:25,471 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-25 00:43:25,471 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-25 00:43:25,471 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-25 00:43:25,471 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-25 00:43:25,471 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-25 00:43:25,471 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-25 00:43:25,471 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-25 00:43:25,471 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-25 00:43:25,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:25,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-25 00:43:25,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:25,709 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-25 00:43:25,763 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-25 00:43:25,765 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:25,769 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-25 00:43:25,769 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-25 00:43:25,769 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-25 00:43:26,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:26,076 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-25 00:43:26,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:26,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-25 00:43:26,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:26,226 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-25 00:43:26,226 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-25 00:43:26,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:26,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-25 00:43:26,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:26,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-25 00:43:26,607 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-25 00:43:26,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:26,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:26,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-25 00:43:26,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:26,898 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-25 00:43:26,991 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-25 00:43:26,991 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-25 00:43:26,991 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-25 00:43:26,992 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-25 00:43:26,999 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-25 00:43:27,000 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-25 00:43:27,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:27,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-25 00:43:27,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:27,285 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-25 00:43:27,349 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-25 00:43:27,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:27,360 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-25 00:43:27,360 [ scc.git] DEBUG package.json | 2 +-
2024-09-25 00:43:27,360 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-25 00:43:27,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:27,649 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:43:27,691 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:27,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:27,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:43:27,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:43:27,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e468d340> has no local changes
2024-09-25 00:43:27,761 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:43:27,776 [ scc.git] DEBUG [detached HEAD aee4637] merge master -Dorg -Ssuccess-only
2024-09-25 00:43:27,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:43:27,777 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:43:28,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-25 00:43:28,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-25 00:43:29,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-25 00:43:29,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-25 00:43:30,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:30,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:31,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-25 00:43:31,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:31,529 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-25 00:43:31,530 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:43:31,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-25 00:43:31,530 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:31,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:31,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:43:31,541 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:43:31,541 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:43:31,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:43:31,553 [ scc.git] DEBUG Already up to date.
2024-09-25 00:43:31,553 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-25 00:43:31,894 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-25 00:43:31,894 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-25 00:43:31,899 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:43:31,899 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:31,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:31,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-25 00:43:31,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:31,922 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-25 00:43:31,931 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:31,933 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-25 00:43:31,933 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-25 00:43:31,934 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-25 00:43:31,934 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-25 00:43:31,934 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-25 00:43:31,934 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-25 00:43:32,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:32,086 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:43:32,125 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:32,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:32,130 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:43:32,169 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:43:32,175 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e468d2e0> has no local changes
2024-09-25 00:43:32,176 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:43:32,184 [ scc.git] DEBUG [detached HEAD d37bcbe] merge master -Dorg -Ssuccess-only
2024-09-25 00:43:32,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:43:32,184 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:43:32,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-25 00:43:33,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-25 00:43:33,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-25 00:43:34,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-25 00:43:34,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-25 00:43:35,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:35,488 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-25 00:43:35,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-25 00:43:36,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-25 00:43:36,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-25 00:43:37,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:37,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-25 00:43:38,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:38,297 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-25 00:43:38,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-25 00:43:39,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-25 00:43:39,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-25 00:43:40,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:40,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-25 00:43:41,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:41,032 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-25 00:43:41,032 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:43:41,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-25 00:43:41,032 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:41,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:41,040 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:43:41,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:43:41,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:43:41,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:43:41,062 [ scc.git] DEBUG Already up to date.
2024-09-25 00:43:41,063 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-25 00:43:41,655 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-25 00:43:41,655 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-25 00:43:41,664 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-25 00:43:42,129 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-25 00:43:42,129 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-25 00:43:42,135 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-25 00:43:42,434 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-25 00:43:42,434 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-25 00:43:42,441 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:43:42,442 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:42,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:42,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-25 00:43:42,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:42,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-25 00:43:42,582 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-25 00:43:42,582 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-25 00:43:42,582 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-25 00:43:42,582 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-25 00:43:42,583 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:43:42,583 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:43:42,592 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-25 00:43:42,600 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-25 00:43:42,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:42,774 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-25 00:43:42,782 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-25 00:43:42,790 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-25 00:43:42,797 [ scc.config] DEBUG Found github.token
2024-09-25 00:43:42,797 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-25 00:43:42,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-25 00:43:42,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:42,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-25 00:43:42,853 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-25 00:43:42,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-25 00:43:42,854 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-25 00:43:42,854 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:43:42,858 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:43:42,866 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-25 00:43:42,875 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-25 00:43:43,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:43,165 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-25 00:43:43,172 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-25 00:43:43,178 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-09-25 00:43:43,183 [ scc.config] DEBUG Found github.token
2024-09-25 00:43:43,183 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-25 00:43:43,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-25 00:43:43,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:43,193 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-25 00:43:43,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:43,204 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-25 00:43:43,204 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-25 00:43:43,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:43,556 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:43:43,596 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:43,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:43,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:43:43,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:43:43,646 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e46d6c10> has no local changes
2024-09-25 00:43:43,647 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:43:43,656 [ scc.git] DEBUG [detached HEAD d28c0f4] merge master -Dorg -Ssuccess-only
2024-09-25 00:43:43,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:43:43,656 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:43:44,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-25 00:43:44,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-25 00:43:44,604 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:45,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-25 00:43:45,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:46,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:46,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-25 00:43:47,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:47,168 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-25 00:43:47,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-25 00:43:47,625 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:48,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-25 00:43:48,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:49,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:49,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-25 00:43:50,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:50,199 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-25 00:43:50,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-25 00:43:50,662 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-25 00:43:51,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-25 00:43:51,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:43:52,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:43:52,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-25 00:43:53,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:43:53,164 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-25 00:43:53,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-25 00:43:54,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-25 00:43:54,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-25 00:43:55,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-25 00:43:55,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-25 00:43:55,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-25 00:43:55,984 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:43:55,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-25 00:43:55,984 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:55,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:56,001 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:43:56,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:43:56,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:43:56,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:43:56,054 [ scc.git] DEBUG Already up to date.
2024-09-25 00:43:56,054 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-25 00:43:56,379 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-25 00:43:56,380 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-25 00:43:56,388 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-25 00:43:56,694 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-25 00:43:56,694 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-25 00:43:56,702 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-25 00:43:57,018 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-25 00:43:57,018 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-25 00:43:57,024 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:43:57,025 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:57,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:57,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-25 00:43:57,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:57,052 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-25 00:43:57,066 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:57,071 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-25 00:43:57,072 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-25 00:43:57,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:57,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-25 00:43:57,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:57,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-25 00:43:57,282 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-25 00:43:57,283 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:57,291 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-25 00:43:57,292 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-25 00:43:57,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:57,596 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-25 00:43:57,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:57,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-25 00:43:57,630 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-25 00:43:57,630 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:43:57,634 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-25 00:43:57,634 [ scc.git] DEBUG package.json | 2 +-
2024-09-25 00:43:57,634 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-25 00:43:57,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:43:57,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:43:58,023 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:43:58,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:43:58,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:43:58,070 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:43:58,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4f3cc40> has no local changes
2024-09-25 00:43:58,078 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:43:58,088 [ scc.git] DEBUG [detached HEAD 5274c11] merge master -Dorg -Ssuccess-only
2024-09-25 00:43:58,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:43:58,089 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:43:58,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-25 00:43:58,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-25 00:43:59,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-25 00:43:59,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:00,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-25 00:44:00,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:00,778 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-25 00:44:00,778 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:00,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-25 00:44:00,778 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:00,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:00,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:00,789 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:00,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:00,798 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:00,804 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:00,805 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-25 00:44:01,177 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-25 00:44:01,177 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-25 00:44:01,183 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:01,183 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:01,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:01,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-25 00:44:01,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:01,199 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-25 00:44:01,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:44:01,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:01,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:01,391 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:01,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:01,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:01,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:01,440 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e46c7b80> has no local changes
2024-09-25 00:44:01,441 [ 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.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:01,449 [ scc.git] DEBUG [detached HEAD 6a696ca] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:01,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:01,450 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:01,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-25 00:44:02,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-25 00:44:02,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-25 00:44:03,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-25 00:44:03,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-25 00:44:04,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:04,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-25 00:44:05,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:05,005 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-25 00:44:05,005 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:05,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-25 00:44:05,005 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:05,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:05,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:05,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:05,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:05,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:05,026 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:05,027 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-25 00:44:05,423 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-25 00:44:05,423 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-25 00:44:05,428 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:05,428 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:05,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:05,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-25 00:44:05,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:05,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-25 00:44:05,453 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-25 00:44:05,454 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:44:05,456 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-25 00:44:05,456 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-25 00:44:05,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:05,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:05,670 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:05,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:05,685 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:05,740 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:05,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e469bf10> has no local changes
2024-09-25 00:44:05,748 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:05,757 [ scc.git] DEBUG [detached HEAD 78e1532] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:05,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:05,758 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:06,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-25 00:44:06,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-25 00:44:07,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-25 00:44:07,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-25 00:44:07,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:08,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-25 00:44:08,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:08,961 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-25 00:44:08,961 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:08,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-25 00:44:08,961 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:08,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:08,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:08,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:08,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:08,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:08,983 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:08,983 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-25 00:44:09,314 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-25 00:44:09,314 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-25 00:44:09,319 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:09,320 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:09,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:09,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-25 00:44:09,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:09,338 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-25 00:44:09,390 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-25 00:44:09,391 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-25 00:44:09,391 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG Auto-merging setup.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-25 00:44:09,392 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:44:09,394 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:44:09,410 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-25 00:44:09,427 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-25 00:44:09,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:09,567 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-25 00:44:09,573 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-25 00:44:09,579 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-09-25 00:44:09,584 [ scc.config] DEBUG Found github.token
2024-09-25 00:44:09,585 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-25 00:44:09,585 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:09,624 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:09,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:09,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:09,667 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:09,674 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e46b1e50> has no local changes
2024-09-25 00:44:09,674 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:09,682 [ scc.git] DEBUG [detached HEAD 644cb0d] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:09,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:09,683 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:10,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-25 00:44:10,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-25 00:44:11,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-25 00:44:11,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-25 00:44:12,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:12,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-25 00:44:12,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:12,928 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-25 00:44:12,928 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:12,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-25 00:44:12,928 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:12,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:12,934 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:12,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:12,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:12,953 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:12,962 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:12,962 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-25 00:44:13,372 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-25 00:44:13,372 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-25 00:44:13,377 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:13,377 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:13,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:13,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-25 00:44:13,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:13,402 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-09-25 00:44:13,416 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:44:13,421 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-25 00:44:13,421 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-25 00:44:13,421 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-25 00:44:13,421 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-25 00:44:13,423 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-25 00:44:13,424 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-25 00:44:13,424 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-25 00:44:13,424 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-25 00:44:13,425 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-25 00:44:13,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:13,575 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:13,617 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:13,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:13,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:13,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:13,666 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e467efd0> has no local changes
2024-09-25 00:44:13,667 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:13,676 [ scc.git] DEBUG [detached HEAD 7e918a9] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:13,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:13,677 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:14,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-25 00:44:14,040 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:14,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-25 00:44:14,041 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,048 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:14,053 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:14,053 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:14,060 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:14,066 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:14,066 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:14,066 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:14,113 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:14,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:14,169 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4686910> has no local changes
2024-09-25 00:44:14,169 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:14,178 [ scc.git] DEBUG [detached HEAD 190ec18] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:14,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:14,178 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:14,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-25 00:44:14,450 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:14,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-25 00:44:14,450 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,457 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:14,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:14,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:14,468 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:14,474 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:14,474 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:14,474 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,480 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:14,522 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:14,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:14,528 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:14,570 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:14,576 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4658d90> has no local changes
2024-09-25 00:44:14,576 [ 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.
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:14,586 [ scc.git] DEBUG [detached HEAD 13e7e6d] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:14,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:14,587 [ scc.git] INFO Overriding base-branch from master to main
2024-09-25 00:44:14,587 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:14,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-25 00:44:15,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-25 00:44:15,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-25 00:44:16,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-25 00:44:16,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-25 00:44:17,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:17,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-25 00:44:18,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:18,092 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-25 00:44:18,092 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:18,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-25 00:44:18,092 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:18,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:18,097 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-25 00:44:18,102 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:18,102 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-25 00:44:18,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-25 00:44:18,112 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:18,112 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-25 00:44:18,449 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-25 00:44:18,449 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-25 00:44:18,454 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:18,455 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:18,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:18,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-25 00:44:18,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:18,470 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-25 00:44:18,487 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-25 00:44:18,487 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-25 00:44:18,488 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:44:18,488 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:44:18,493 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-25 00:44:18,499 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-25 00:44:18,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:18,650 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-25 00:44:18,656 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-25 00:44:18,661 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-25 00:44:18,666 [ scc.config] DEBUG Found github.token
2024-09-25 00:44:18,666 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-25 00:44:18,666 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:18,704 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:18,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:18,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:18,747 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:18,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e45d31c0> has no local changes
2024-09-25 00:44:18,754 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:18,763 [ scc.git] DEBUG [detached HEAD b78d428] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:18,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:18,764 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:19,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-25 00:44:19,059 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:19,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-25 00:44:19,059 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,064 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:19,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:19,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:19,075 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:19,081 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:19,082 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:19,082 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,087 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:19,141 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,147 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:19,186 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:19,192 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e464ffa0> has no local changes
2024-09-25 00:44:19,192 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:19,200 [ scc.git] DEBUG [detached HEAD 51e12db] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:19,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:19,201 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:19,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-25 00:44:19,468 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:19,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-25 00:44:19,468 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,474 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:19,479 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:19,480 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:19,487 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:19,494 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:19,495 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:19,495 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,500 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:19,542 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:19,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:19,547 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:19,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:19,590 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e4649f10> has no local changes
2024-09-25 00:44:19,590 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:19,598 [ scc.git] DEBUG [detached HEAD 6208cd0] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:19,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:19,598 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:19,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-25 00:44:20,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-25 00:44:20,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-25 00:44:21,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-25 00:44:21,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:22,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-25 00:44:22,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:22,716 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-25 00:44:22,716 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:22,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-25 00:44:22,716 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:22,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:22,722 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-25 00:44:22,729 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:22,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-25 00:44:22,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-25 00:44:22,743 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:22,743 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-25 00:44:23,152 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-25 00:44:23,153 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-25 00:44:23,159 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:23,159 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:23,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:23,166 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-25 00:44:23,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:23,178 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-25 00:44:23,216 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-25 00:44:23,217 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-25 00:44:23,217 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:44:23,217 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:44:23,223 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-25 00:44:23,230 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-25 00:44:23,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:23,364 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-25 00:44:23,370 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-25 00:44:23,377 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-25 00:44:23,382 [ scc.config] DEBUG Found github.token
2024-09-25 00:44:23,382 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-25 00:44:23,383 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:23,422 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:23,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:23,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:23,478 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:23,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e460de50> has no local changes
2024-09-25 00:44:23,485 [ 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#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:23,496 [ scc.git] DEBUG [detached HEAD 3a50318] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:23,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:23,496 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-25 00:44:23,496 [ scc.repo] DEBUG ## PRs found:
2024-09-25 00:44:23,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-25 00:44:24,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-09-25 00:44:24,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-25 00:44:25,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:25,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-25 00:44:26,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-25 00:44:26,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:26,662 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-25 00:44:27,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-25 00:44:27,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-25 00:44:28,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-25 00:44:28,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-25 00:44:29,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-25 00:44:29,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-25 00:44:29,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-25 00:44:30,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-25 00:44:30,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-25 00:44:31,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-25 00:44:31,281 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-25 00:44:31,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-25 00:44:32,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-25 00:44:32,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-25 00:44:33,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-25 00:44:33,210 [ scc.repo] DEBUG ## Branches found:
2024-09-25 00:44:33,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-25 00:44:33,211 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:33,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:33,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-25 00:44:33,224 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-25 00:44:33,225 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-25 00:44:33,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-25 00:44:33,238 [ scc.git] DEBUG Already up to date.
2024-09-25 00:44:33,238 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-25 00:44:33,671 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-25 00:44:33,671 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-25 00:44:33,676 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-09-25 00:44:34,103 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-25 00:44:34,103 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-09-25 00:44:34,108 [ scc.git] DEBUG ## Unique users: []
2024-09-25 00:44:34,108 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:34,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:34,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-25 00:44:34,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:34,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-25 00:44:34,204 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-25 00:44:34,204 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-25 00:44:34,204 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-25 00:44:34,205 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-25 00:44:34,212 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-25 00:44:34,220 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-25 00:44:34,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:34,358 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-25 00:44:34,365 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-25 00:44:34,371 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#194](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-25 00:44:34,376 [ scc.config] DEBUG Found github.token
2024-09-25 00:44:34,377 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-25 00:44:34,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-25 00:44:34,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:34,388 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-25 00:44:34,399 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-25 00:44:34,402 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-09-25 00:44:34,402 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-09-25 00:44:34,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:34,739 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-25 00:44:34,795 [ scc.git] DEBUG Get sha1 of %s
2024-09-25 00:44:34,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-25 00:44:34,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:34,865 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:34,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e460a640> has no local changes
2024-09-25 00:44:34,874 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:34,887 [ scc.git] DEBUG [detached HEAD 91cb3ff] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:34,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:34,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-25 00:44:34,978 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-25 00:44:35,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:35,137 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-25 00:44:35,145 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-25 00:44:35,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:35,567 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-25 00:44:35,575 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-25 00:44:35,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:36,000 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-25 00:44:36,007 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-25 00:44:36,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:36,401 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-25 00:44:36,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:36,778 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-25 00:44:36,785 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-25 00:44:37,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:37,172 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-25 00:44:37,179 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-25 00:44:37,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:37,556 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-25 00:44:37,561 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-25 00:44:37,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:37,952 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-25 00:44:37,958 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-25 00:44:38,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:38,345 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-25 00:44:38,350 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-25 00:44:38,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:38,748 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-25 00:44:38,754 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-25 00:44:39,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:39,138 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-25 00:44:39,145 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-25 00:44:39,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:39,520 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-25 00:44:39,527 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-25 00:44:39,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:39,936 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-25 00:44:40,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:40,321 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-25 00:44:40,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:40,703 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-25 00:44:40,710 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-25 00:44:41,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:41,094 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-25 00:44:41,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:41,479 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-25 00:44:41,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:41,880 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-25 00:44:41,884 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-25 00:44:42,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:42,271 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-25 00:44:42,278 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-25 00:44:42,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:42,666 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-25 00:44:42,673 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-25 00:44:43,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:43,078 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-25 00:44:43,094 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-25 00:44:43,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-25 00:44:43,447 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-25 00:44:43,447 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-25 00:44:43,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f54e6512b80> has local changes
2024-09-25 00:44:43,559 [ 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 390 dependabot[bot] 'Bump omero-figure from `5f62399` to `f9a321d`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
- PR 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute' (status: action_required)
- PR 588 dependabot[bot] 'Bump dompurify from 2.4.3 to 2.5.4' (status: failure)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
- PR 587 will-moore 'Update licenses.txt'
- PR 590 dependabot[bot] 'Bump vite from 3.2.10 to 3.2.11'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
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
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.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#194 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/194/)'
2024-09-25 00:44:43,577 [ scc.git] DEBUG [detached HEAD cf44819] merge master -Dorg -Ssuccess-only
2024-09-25 00:44:43,577 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-25 00:44:43,577 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-25 00:44:43,578 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 390 dependabot[bot] 'Bump omero-figure from `5f62399` to `f9a321d`'
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-25 00:44:43,578 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-25 00:44:43,578 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-25 00:44:43,578 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-25 00:44:43,578 [ scc.merge] INFO
2024-09-25 00:44:43,578 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-25 00:44:43,578 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-25 00:44:43,578 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-25 00:44:43,579 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,579 [ scc.merge] INFO
2024-09-25 00:44:43,579 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-25 00:44:43,579 [ scc.merge] INFO
2024-09-25 00:44:43,579 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-25 00:44:43,579 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-25 00:44:43,579 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,579 [ scc.merge] INFO
2024-09-25 00:44:43,579 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-25 00:44:43,579 [ scc.merge] INFO
2024-09-25 00:44:43,579 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-25 00:44:43,579 [ scc.merge] INFO
2024-09-25 00:44:43,579 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-25 00:44:43,579 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute' (status: action_required)
2024-09-25 00:44:43,579 [ scc.merge] INFO - PR 588 dependabot[bot] 'Bump dompurify from 2.4.3 to 2.5.4' (status: failure)
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-25 00:44:43,580 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,580 [ scc.merge] INFO
2024-09-25 00:44:43,580 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 587 will-moore 'Update licenses.txt'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 590 dependabot[bot] 'Bump vite from 3.2.10 to 3.2.11'
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-09-25 00:44:43,580 [ scc.merge] INFO
2024-09-25 00:44:43,580 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-25 00:44:43,580 [ scc.merge] INFO
2024-09-25 00:44:43,580 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-25 00:44:43,580 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,580 [ scc.merge] INFO
2024-09-25 00:44:43,580 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,580 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-25 00:44:43,580 [ scc.merge] INFO
2024-09-25 00:44:43,580 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-25 00:44:43,580 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,581 [ scc.merge] INFO
2024-09-25 00:44:43,581 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-25 00:44:43,581 [ scc.merge] INFO
2024-09-25 00:44:43,581 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-25 00:44:43,581 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-25 00:44:43,581 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,581 [ scc.merge] INFO
2024-09-25 00:44:43,581 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-25 00:44:43,581 [ scc.merge] INFO
2024-09-25 00:44:43,581 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-25 00:44:43,581 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,581 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-25 00:44:43,581 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,581 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-25 00:44:43,582 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-25 00:44:43,582 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-25 00:44:43,582 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,582 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-25 00:44:43,582 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-25 00:44:43,582 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-25 00:44:43,583 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,583 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-25 00:44:43,583 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,583 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-25 00:44:43,583 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,583 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-25 00:44:43,583 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,583 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-25 00:44:43,583 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,583 [ scc.merge] INFO
2024-09-25 00:44:43,583 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,583 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-25 00:44:43,584 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-25 00:44:43,584 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-25 00:44:43,584 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,584 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-25 00:44:43,584 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,584 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-25 00:44:43,584 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-25 00:44:43,584 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,584 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-25 00:44:43,585 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,585 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-25 00:44:43,585 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] INFO Repository: ome/scripts
2024-09-25 00:44:43,585 [ scc.merge] INFO Excluded PRs:
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-25 00:44:43,585 [ scc.merge] INFO Already up to date.
2024-09-25 00:44:43,585 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] INFO Merged PRs:
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-25 00:44:43,585 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-25 00:44:43,585 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-25 00:44:43,585 [ scc.merge] INFO
2024-09-25 00:44:43,585 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-25 00:44:43,586 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-25 00:44:43,593 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-25 00:44:43,600 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-25 00:44:43,607 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-25 00:44:43,614 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-25 00:44:43,621 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-25 00:44:43,628 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-25 00:44:43,635 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-25 00:44:43,644 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-25 00:44:43,658 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-25 00:44:43,674 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-25 00:44:43,689 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-25 00:44:43,704 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-25 00:44:43,715 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-25 00:44:43,722 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-25 00:44:43,728 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-25 00:44:43,734 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-25 00:44:43,742 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-25 00:44:43,749 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-25 00:44:43,756 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-25 00:44:43,762 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-25 00:44:43,771 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-25 00:44:43,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-25 00:44:43,778 [ scc.git] DEBUG Calling 'git remote'
2024-09-25 00:44:43,783 [ 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.9.2 to 5.9.4-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 5ea1aa3] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 f9a321dd
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD d097f10] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-09-25 00:45:28,692 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-09-25 00:45:37,467 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-09-25 00:45:39,806 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-25 00:45:44,690 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-25 00:46:26,865 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
