Console Output
Skipping 116 KB..
Full Log:32:34,088 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:32:34,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:32:34,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1061e880> has no local changes
2024-09-26 11:32:34,192 [ 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 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 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 593 dependabot[bot] 'Bump rollup and vite'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:32:34,222 [ scc.git] DEBUG [detached HEAD 68dbbc49] merge master -Dorg -Ssuccess-only
2024-09-26 11:32:34,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:32:34,224 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:32:34,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-26 11:32:34,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-26 11:32:35,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-26 11:32:36,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-26 11:32:36,582 [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-26 11:32:37,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-26 11:32:37,569 [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-26 11:32:37,570 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-26 11:32:37,570 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:32:37,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-26 11:32:37,570 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:37,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:37,578 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:32:37,584 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:32:37,584 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:32:37,592 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:32:37,602 [ scc.git] DEBUG Already up to date.
2024-09-26 11:32:37,602 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-26 11:32:37,990 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-26 11:32:37,990 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-26 11:32:37,997 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:32:37,997 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:37,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:38,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-26 11:32:38,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:38,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-26 11:32:38,042 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-26 11:32:38,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:32:38,046 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-26 11:32:38,046 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-26 11:32:38,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:32:38,200 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:32:38,250 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:38,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:38,259 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:32:38,304 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:32:38,313 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc105e3d90> has no local changes
2024-09-26 11:32:38,313 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:32:38,323 [ scc.git] DEBUG [detached HEAD 543f166] merge master -Dorg -Ssuccess-only
2024-09-26 11:32:38,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:32:38,324 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:32:38,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-26 11:32:39,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-26 11:32:39,285 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:32:39,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-26 11:32:40,468 [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-26 11:32:40,974 [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-26 11:32:41,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-26 11:32:42,099 [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-26 11:32:42,100 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-26 11:32:42,100 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:32:42,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-26 11:32:42,100 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:42,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:42,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:32:42,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:32:42,113 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:32:42,121 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:32:42,127 [ scc.git] DEBUG Already up to date.
2024-09-26 11:32:42,127 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-26 11:32:42,459 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-26 11:32:42,459 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-26 11:32:42,464 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:32:42,464 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:42,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:42,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-26 11:32:42,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:42,483 [ 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-26 11:32:42,495 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:32:42,500 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-26 11:32:42,500 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-26 11:32:42,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:32:42,653 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:32:42,694 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:32:42,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:32:42,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:32:42,740 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:32:42,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1059bf10> has no local changes
2024-09-26 11:32:42,749 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:32:42,760 [ scc.git] DEBUG [detached HEAD eb5e3d9] merge master -Dorg -Ssuccess-only
2024-09-26 11:32:42,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:32:42,761 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:32:43,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-26 11:32:43,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-26 11:32:43,744 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:32:44,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-26 11:32:45,010 [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-26 11:32:45,536 [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-26 11:32:45,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-26 11:32:46,384 [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-26 11:32:46,385 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-26 11:32:46,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-26 11:32:47,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-26 11:32:47,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-26 11:32:48,411 [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-26 11:32:48,959 [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-26 11:32:49,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-26 11:32:49,842 [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-26 11:32:49,843 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-26 11:32:50,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-26 11:32:50,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-26 11:32:50,781 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:32:51,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-26 11:32:52,319 [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-26 11:32:52,843 [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-26 11:32:53,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-26 11:32:53,866 [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-26 11:32:53,867 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-26 11:32:54,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-26 11:32:54,387 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:32:54,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-26 11:32:55,467 [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-26 11:32:55,960 [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-26 11:32:56,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-26 11:32:57,039 [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-26 11:32:57,040 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-26 11:32:57,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-26 11:32:58,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-26 11:32:58,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-26 11:32:59,239 [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-26 11:32:59,693 [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-26 11:33:00,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-26 11:33:00,678 [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-26 11:33:00,679 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-26 11:33:01,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-26 11:33:01,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-26 11:33:02,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-26 11:33:02,765 [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-26 11:33:03,213 [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-26 11:33:03,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-26 11:33:04,158 [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-26 11:33:04,159 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-26 11:33:04,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-26 11:33:05,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-26 11:33:06,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-26 11:33:06,508 [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-26 11:33:07,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-26 11:33:07,528 [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-26 11:33:07,528 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-26 11:33:07,529 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:07,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-26 11:33:07,529 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:07,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:07,536 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:07,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:07,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:07,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:07,613 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:07,614 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-26 11:33:08,051 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:08,052 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-26 11:33:08,057 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-26 11:33:08,753 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:08,753 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-26 11:33:08,760 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-26 11:33:09,135 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:09,135 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-26 11:33:09,140 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-26 11:33:09,437 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:09,438 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-26 11:33:09,444 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-26 11:33:09,741 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:09,741 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-26 11:33:09,746 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-26 11:33:10,041 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:10,041 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-26 11:33:10,047 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-26 11:33:10,337 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-26 11:33:10,338 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-26 11:33:10,344 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:10,344 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:10,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:10,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-26 11:33:10,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:10,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-26 11:33:10,502 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-26 11:33:10,503 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:10,507 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-26 11:33:10,507 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-26 11:33:10,507 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-26 11:33:10,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:10,656 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-26 11:33:10,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:10,671 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-26 11:33:10,816 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-26 11:33:10,817 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-26 11:33:10,817 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-26 11:33:10,817 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-26 11:33:10,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:10,822 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-26 11:33:10,822 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-26 11:33:10,822 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-26 11:33:10,822 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-26 11:33:10,822 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-26 11:33:10,822 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-26 11:33:10,823 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-26 11:33:10,823 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-26 11:33:11,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:11,056 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-26 11:33:11,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:11,074 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-26 11:33:11,102 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-26 11:33:11,102 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:11,106 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-26 11:33:11,106 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-26 11:33:11,106 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-26 11:33:11,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:11,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-26 11:33:11,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:11,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-26 11:33:11,588 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:11,598 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-26 11:33:11,598 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-26 11:33:11,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:11,861 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-26 11:33:11,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:11,874 [ 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-26 11:33:11,965 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-26 11:33:11,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:12,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:12,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-26 11:33:12,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:12,257 [ 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-26 11:33:12,432 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-26 11:33:12,432 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-26 11:33:12,432 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-26 11:33:12,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-26 11:33:12,437 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-26 11:33:12,437 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-26 11:33:12,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:12,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-26 11:33:12,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:12,679 [ 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-26 11:33:12,798 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-26 11:33:12,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:12,810 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-26 11:33:12,810 [ scc.git] DEBUG package.json | 2 +-
2024-09-26 11:33:12,810 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-26 11:33:13,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:13,093 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:13,136 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:13,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:13,147 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:13,189 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:13,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc105a68e0> has no local changes
2024-09-26 11:33:13,200 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:13,212 [ scc.git] DEBUG [detached HEAD ec57e46] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:13,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:13,213 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:13,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-26 11:33:14,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-26 11:33:14,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-26 11:33:15,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-26 11:33:15,622 [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-26 11:33:16,099 [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-26 11:33:16,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-26 11:33:16,941 [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-26 11:33:16,942 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-26 11:33:16,942 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:16,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-26 11:33:16,943 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:16,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:16,956 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:16,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:16,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:16,969 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:16,978 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:16,979 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-26 11:33:17,287 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-26 11:33:17,287 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-26 11:33:17,292 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:17,292 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:17,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:17,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-26 11:33:17,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:17,313 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-26 11:33:17,325 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:17,328 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-26 11:33:17,328 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-26 11:33:17,328 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-26 11:33:17,328 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-26 11:33:17,329 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-26 11:33:17,331 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-26 11:33:17,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:17,473 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:17,519 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:17,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:17,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:17,570 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:17,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc105a6b20> has no local changes
2024-09-26 11:33:17,578 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:17,588 [ scc.git] DEBUG [detached HEAD 08b227d] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:17,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:17,589 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:18,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-26 11:33:18,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-26 11:33:19,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-26 11:33:19,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-26 11:33:19,951 [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-26 11:33:20,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-26 11:33:20,823 [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-26 11:33:20,824 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-26 11:33:21,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-26 11:33:21,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-26 11:33:22,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-26 11:33:22,833 [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-26 11:33:23,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-26 11:33:23,717 [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-26 11:33:23,718 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-26 11:33:24,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-26 11:33:24,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-26 11:33:25,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-26 11:33:25,692 [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-26 11:33:26,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-26 11:33:26,599 [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-26 11:33:26,600 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-26 11:33:26,600 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:26,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-26 11:33:26,601 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:26,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:26,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:26,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:26,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:26,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:26,626 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:26,626 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-26 11:33:27,133 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-26 11:33:27,133 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-26 11:33:27,138 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-26 11:33:27,611 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-26 11:33:27,611 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-26 11:33:27,616 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-26 11:33:27,902 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-26 11:33:27,902 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-26 11:33:27,907 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:27,907 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:27,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:27,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-26 11:33:27,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:27,924 [ 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-26 11:33:27,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-26 11:33:27,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-26 11:33:27,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-26 11:33:27,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-26 11:33:27,964 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:33:27,964 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:33:27,971 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-26 11:33:27,980 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-26 11:33:28,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:28,125 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-26 11:33:28,134 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-26 11:33:28,140 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-09-26 11:33:28,146 [ scc.config] DEBUG Found github.token
2024-09-26 11:33:28,146 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-26 11:33:28,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-26 11:33:28,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:28,161 [ 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-26 11:33:28,182 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-26 11:33:28,182 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-26 11:33:28,182 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-26 11:33:28,182 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:33:28,183 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:33:28,190 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-26 11:33:28,198 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-26 11:33:28,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:28,525 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-26 11:33:28,534 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-26 11:33:28,539 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/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-26 11:33:28,545 [ scc.config] DEBUG Found github.token
2024-09-26 11:33:28,545 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-26 11:33:28,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-26 11:33:28,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:28,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-26 11:33:28,567 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:28,570 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-26 11:33:28,570 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-26 11:33:28,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:28,911 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:28,952 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:28,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:28,959 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:29,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:29,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1056cf40> has no local changes
2024-09-26 11:33:29,011 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:29,020 [ scc.git] DEBUG [detached HEAD e4da7e1] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:29,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:29,021 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:29,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-26 11:33:29,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-26 11:33:29,926 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:33:30,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-26 11:33:30,994 [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-26 11:33:31,478 [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-26 11:33:31,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-26 11:33:32,316 [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-26 11:33:32,316 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-26 11:33:32,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-26 11:33:32,785 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:33:33,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-26 11:33:33,979 [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-26 11:33:34,437 [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-26 11:33:34,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-26 11:33:35,461 [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-26 11:33:35,462 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-26 11:33:35,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-26 11:33:35,951 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-26 11:33:36,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-26 11:33:37,014 [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-26 11:33:37,476 [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-26 11:33:38,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-26 11:33:38,472 [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-26 11:33:38,473 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-26 11:33:38,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-26 11:33:39,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-26 11:33:39,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-26 11:33:40,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-26 11:33:40,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-26 11:33:41,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-26 11:33:41,339 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:41,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-26 11:33:41,339 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:41,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:41,346 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:41,351 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:41,352 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:41,357 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:41,363 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:41,363 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-26 11:33:41,690 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-26 11:33:41,691 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-26 11:33:41,695 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-26 11:33:41,985 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-26 11:33:41,986 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-26 11:33:41,990 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-26 11:33:42,310 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-26 11:33:42,311 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-26 11:33:42,315 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:42,315 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:42,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:42,321 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-26 11:33:42,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:42,331 [ 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-26 11:33:42,340 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:42,344 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-26 11:33:42,344 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-26 11:33:42,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:42,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-26 11:33:42,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:42,504 [ 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-26 11:33:42,516 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-26 11:33:42,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:42,520 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-26 11:33:42,520 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-26 11:33:42,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:42,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-26 11:33:42,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:42,898 [ 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-26 11:33:42,911 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-26 11:33:42,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:42,915 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-26 11:33:42,915 [ scc.git] DEBUG package.json | 2 +-
2024-09-26 11:33:42,915 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-26 11:33:43,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:43,277 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:43,319 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:43,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:43,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:43,366 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:43,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1059b400> has no local changes
2024-09-26 11:33:43,374 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:43,384 [ scc.git] DEBUG [detached HEAD e9fe7f6] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:43,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:43,385 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:43,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-26 11:33:44,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-26 11:33:44,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-26 11:33:45,254 [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-26 11:33:45,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-26 11:33:46,191 [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-26 11:33:46,191 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-26 11:33:46,191 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:46,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-26 11:33:46,192 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:46,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:46,197 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:46,203 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:46,203 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:46,208 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:46,214 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:46,214 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-26 11:33:46,527 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-26 11:33:46,527 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-26 11:33:46,532 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:46,532 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:46,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:46,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-26 11:33:46,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:46,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-26 11:33:46,559 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:46,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:46,743 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:46,787 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:46,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:46,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:46,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:46,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc10562b20> has no local changes
2024-09-26 11:33:46,840 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:46,849 [ scc.git] DEBUG [detached HEAD 599bbd3] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:46,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:46,850 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:47,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-26 11:33:47,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-26 11:33:48,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-26 11:33:48,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-26 11:33:49,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-26 11:33:49,711 [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-26 11:33:50,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-26 11:33:50,662 [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-26 11:33:50,663 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-26 11:33:50,663 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:50,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-26 11:33:50,663 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:50,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:50,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:50,676 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:50,676 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:50,682 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:50,688 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:50,688 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-26 11:33:51,046 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-26 11:33:51,046 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-26 11:33:51,051 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:51,051 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:51,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:51,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-26 11:33:51,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:51,072 [ 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-26 11:33:51,082 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-26 11:33:51,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:51,085 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-26 11:33:51,085 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-26 11:33:51,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:51,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:51,274 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:51,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:51,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:51,320 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:51,327 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1054eee0> has no local changes
2024-09-26 11:33:51,327 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:51,335 [ scc.git] DEBUG [detached HEAD 6470c12] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:51,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:51,336 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:51,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-26 11:33:52,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-26 11:33:52,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-26 11:33:53,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-26 11:33:53,802 [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-26 11:33:54,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-26 11:33:54,639 [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-26 11:33:54,639 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-26 11:33:54,640 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:54,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-26 11:33:54,640 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:54,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:54,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:54,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:54,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:54,665 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:54,673 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:54,673 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-26 11:33:55,098 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-26 11:33:55,098 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-26 11:33:55,103 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:55,103 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:55,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:55,110 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-26 11:33:55,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:55,121 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-26 11:33:55,174 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-26 11:33:55,174 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-26 11:33:55,174 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-26 11:33:55,174 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-26 11:33:55,174 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-26 11:33:55,174 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-26 11:33:55,175 [ scc.git] DEBUG Auto-merging setup.py
2024-09-26 11:33:55,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-26 11:33:55,175 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:33:55,175 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:33:55,182 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-26 11:33:55,190 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-26 11:33:55,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:55,348 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-26 11:33:55,355 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-26 11:33:55,361 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-09-26 11:33:55,366 [ scc.config] DEBUG Found github.token
2024-09-26 11:33:55,366 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-26 11:33:55,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:55,407 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:55,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:55,413 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:55,451 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:55,457 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1052fbe0> has no local changes
2024-09-26 11:33:55,458 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:55,466 [ scc.git] DEBUG [detached HEAD 96ed85b] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:55,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:55,466 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:55,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-26 11:33:56,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-26 11:33:56,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-26 11:33:57,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-26 11:33:57,809 [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-26 11:33:58,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-26 11:33:58,676 [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-26 11:33:58,677 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-26 11:33:58,677 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:58,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-26 11:33:58,677 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:58,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:58,684 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:58,689 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:58,689 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:58,695 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:58,701 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:58,702 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-26 11:33:59,065 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-26 11:33:59,065 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-26 11:33:59,071 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:59,071 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:59,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-26 11:33:59,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,093 [ 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-26 11:33:59,106 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-26 11:33:59,109 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-26 11:33:59,110 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-26 11:33:59,110 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-26 11:33:59,110 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-26 11:33:59,112 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-26 11:33:59,112 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-26 11:33:59,112 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-26 11:33:59,112 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-26 11:33:59,112 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-26 11:33:59,112 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-26 11:33:59,113 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-26 11:33:59,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:33:59,247 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:59,292 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:59,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:59,340 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:59,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1051c640> has no local changes
2024-09-26 11:33:59,348 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:59,359 [ scc.git] DEBUG [detached HEAD 7eb0caf] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:59,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:59,360 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:33:59,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-26 11:33:59,688 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:33:59,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-26 11:33:59,688 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:59,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,694 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:33:59,700 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:33:59,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:33:59,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:33:59,713 [ scc.git] DEBUG Already up to date.
2024-09-26 11:33:59,713 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:33:59,713 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:59,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,719 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:33:59,763 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:33:59,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:33:59,769 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:33:59,811 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:33:59,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc1051f070> has no local changes
2024-09-26 11:33:59,818 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:33:59,828 [ scc.git] DEBUG [detached HEAD 7217e78] merge master -Dorg -Ssuccess-only
2024-09-26 11:33:59,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:33:59,828 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:00,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-26 11:34:00,113 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:00,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-26 11:34:00,113 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:00,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:00,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:34:00,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:00,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:34:00,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:34:00,137 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:00,137 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:00,137 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:00,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:00,143 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:00,184 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:00,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:00,190 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:00,232 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:00,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc10562d60> has no local changes
2024-09-26 11:34:00,240 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:00,249 [ scc.git] DEBUG [detached HEAD d62cbcc] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:00,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:00,250 [ scc.git] INFO Overriding base-branch from master to main
2024-09-26 11:34:00,250 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:00,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-26 11:34:01,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-26 11:34:01,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-26 11:34:02,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-26 11:34:02,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-26 11:34:02,969 [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-26 11:34:03,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-26 11:34:03,920 [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-26 11:34:03,921 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-26 11:34:03,921 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:03,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-26 11:34:03,921 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:03,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:03,927 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-26 11:34:03,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:03,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-26 11:34:03,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-26 11:34:03,947 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:03,947 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-26 11:34:04,298 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-26 11:34:04,298 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-26 11:34:04,303 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:04,303 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:04,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:04,309 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-26 11:34:04,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:04,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-26 11:34:04,397 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-26 11:34:04,398 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-26 11:34:04,398 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:34:04,398 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:34:04,405 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-26 11:34:04,412 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-26 11:34:04,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:04,681 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-26 11:34:04,688 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-26 11:34:04,694 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-26 11:34:04,700 [ scc.config] DEBUG Found github.token
2024-09-26 11:34:04,700 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-26 11:34:04,700 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:04,741 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:04,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:04,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:04,789 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:04,796 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc104c6b20> has no local changes
2024-09-26 11:34:04,796 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:04,805 [ scc.git] DEBUG [detached HEAD 28be031] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:04,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:04,806 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:05,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-26 11:34:05,173 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:05,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-26 11:34:05,174 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,180 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:34:05,185 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:05,185 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:34:05,191 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:34:05,198 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:05,198 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:05,198 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,205 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:05,246 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,252 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:05,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:05,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc10509d60> has no local changes
2024-09-26 11:34:05,301 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:05,310 [ scc.git] DEBUG [detached HEAD 0c62321] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:05,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:05,311 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:05,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-26 11:34:05,606 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:05,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-26 11:34:05,606 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:34:05,620 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:05,620 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:34:05,627 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:34:05,635 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:05,635 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:05,635 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,641 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:05,683 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:05,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:05,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:05,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:05,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc104e3ee0> has no local changes
2024-09-26 11:34:05,736 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:05,745 [ scc.git] DEBUG [detached HEAD c909e32] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:05,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:05,745 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:06,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-26 11:34:06,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-26 11:34:07,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-26 11:34:07,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-26 11:34:08,044 [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-26 11:34:08,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-26 11:34:09,048 [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-26 11:34:09,049 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-26 11:34:09,049 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:09,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-26 11:34:09,049 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:09,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:09,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-26 11:34:09,063 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:09,063 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-26 11:34:09,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-26 11:34:09,076 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:09,076 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-26 11:34:09,451 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-26 11:34:09,451 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-26 11:34:09,457 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:09,457 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:09,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:09,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-26 11:34:09,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:09,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-26 11:34:09,511 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-26 11:34:09,512 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-26 11:34:09,512 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:34:09,512 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:34:09,520 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-26 11:34:09,528 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-26 11:34:09,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:09,683 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-26 11:34:09,690 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-26 11:34:09,698 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-26 11:34:09,705 [ scc.config] DEBUG Found github.token
2024-09-26 11:34:09,706 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-26 11:34:09,706 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:09,755 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:09,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:09,762 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:09,808 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:09,817 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc104aabe0> has no local changes
2024-09-26 11:34:09,817 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:09,828 [ scc.git] DEBUG [detached HEAD 1bc8a0d] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:09,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:09,829 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-26 11:34:09,829 [ scc.repo] DEBUG ## PRs found:
2024-09-26 11:34:10,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-26 11:34:10,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-09-26 11:34:11,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-26 11:34:11,650 [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-26 11:34:12,099 [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-26 11:34:12,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-09-26 11:34:12,999 [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-26 11:34:13,000 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-26 11:34:13,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-26 11:34:14,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-26 11:34:14,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-26 11:34:15,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-26 11:34:15,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-26 11:34:15,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-26 11:34:16,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-26 11:34:16,882 [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-26 11:34:17,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-26 11:34:17,785 [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-26 11:34:17,786 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-26 11:34:18,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-26 11:34:18,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-26 11:34:19,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-26 11:34:19,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-26 11:34:19,848 [ scc.repo] DEBUG ## Branches found:
2024-09-26 11:34:19,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-26 11:34:19,849 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:19,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:19,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-26 11:34:19,861 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-26 11:34:19,861 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-26 11:34:19,868 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-26 11:34:19,874 [ scc.git] DEBUG Already up to date.
2024-09-26 11:34:19,875 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-26 11:34:20,553 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-26 11:34:20,553 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-26 11:34:20,558 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-09-26 11:34:20,869 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-26 11:34:20,869 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-09-26 11:34:20,874 [ scc.git] DEBUG ## Unique users: []
2024-09-26 11:34:20,874 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:20,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:20,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-26 11:34:20,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:20,893 [ 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-26 11:34:20,951 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-26 11:34:20,952 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-26 11:34:20,952 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-26 11:34:20,952 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-26 11:34:20,959 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-26 11:34:20,966 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-26 11:34:21,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:21,119 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-26 11:34:21,128 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-26 11:34:21,134 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#196](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-26 11:34:21,140 [ scc.config] DEBUG Found github.token
2024-09-26 11:34:21,140 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-26 11:34:21,140 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-09-26 11:34:21,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:21,152 [ 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-26 11:34:21,162 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-26 11:34:21,165 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-09-26 11:34:21,165 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-09-26 11:34:21,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:21,509 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-26 11:34:21,553 [ scc.git] DEBUG Get sha1 of %s
2024-09-26 11:34:21,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-26 11:34:21,559 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:21,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:21,608 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc104a75b0> has no local changes
2024-09-26 11:34:21,609 [ 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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:21,618 [ scc.git] DEBUG [detached HEAD 1669379] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:21,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:21,619 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-26 11:34:21,700 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-26 11:34:21,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:21,914 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-26 11:34:21,919 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-26 11:34:22,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:22,313 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-26 11:34:22,318 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-26 11:34:22,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:22,710 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-26 11:34:22,715 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-26 11:34:23,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:23,104 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-26 11:34:23,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:23,528 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-26 11:34:23,534 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-26 11:34:23,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:23,927 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-26 11:34:23,932 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-26 11:34:24,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:24,317 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-26 11:34:24,323 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-26 11:34:24,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:24,708 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-26 11:34:24,712 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-26 11:34:25,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:25,104 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-26 11:34:25,109 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-26 11:34:25,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:25,491 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-26 11:34:25,496 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-26 11:34:25,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:25,879 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-26 11:34:25,884 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-26 11:34:26,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:26,279 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-26 11:34:26,285 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-26 11:34:26,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:26,681 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-26 11:34:27,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:27,068 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-26 11:34:27,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:27,448 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-26 11:34:27,453 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-26 11:34:27,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:27,840 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-26 11:34:28,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:28,236 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-26 11:34:28,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:28,625 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-26 11:34:28,630 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-26 11:34:29,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:29,014 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-26 11:34:29,019 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-26 11:34:29,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:29,404 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-26 11:34:29,410 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-26 11:34:29,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:29,795 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-26 11:34:29,800 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-26 11:34:30,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-26 11:34:30,183 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-26 11:34:30,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-26 11:34:30,268 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbc11108b80> has local changes
2024-09-26 11:34:30,268 [ 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 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 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 593 dependabot[bot] 'Bump rollup and vite'
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#196 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/196/)'
2024-09-26 11:34:30,290 [ scc.git] DEBUG [detached HEAD 7bb6f81] merge master -Dorg -Ssuccess-only
2024-09-26 11:34:30,290 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-26 11:34:30,290 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-26 11:34:30,290 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,290 [ scc.merge] INFO
2024-09-26 11:34:30,290 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,290 [ scc.merge] INFO - PR 390 dependabot[bot] 'Bump omero-figure from `5f62399` to `f9a321d`'
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-26 11:34:30,291 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-26 11:34:30,291 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-26 11:34:30,291 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-26 11:34:30,291 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-26 11:34:30,291 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-26 11:34:30,291 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-26 11:34:30,291 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,291 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-26 11:34:30,291 [ scc.merge] INFO
2024-09-26 11:34:30,291 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-26 11:34:30,292 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 588 dependabot[bot] 'Bump dompurify from 2.4.3 to 2.5.4' (status: failure)
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-26 11:34:30,292 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 587 will-moore 'Update licenses.txt'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 589 JensWendt 'implemented get_timestamps() from timeIncrement attribute'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 593 dependabot[bot] 'Bump rollup and vite'
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-26 11:34:30,292 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-26 11:34:30,292 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,292 [ scc.merge] INFO
2024-09-26 11:34:30,292 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,292 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-26 11:34:30,293 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-26 11:34:30,293 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-26 11:34:30,293 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-26 11:34:30,293 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-26 11:34:30,293 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-26 11:34:30,293 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-26 11:34:30,293 [ scc.merge] INFO
2024-09-26 11:34:30,293 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-26 11:34:30,294 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-26 11:34:30,294 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-26 11:34:30,294 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-26 11:34:30,294 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-26 11:34:30,294 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-26 11:34:30,294 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-26 11:34:30,294 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,294 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,294 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-26 11:34:30,294 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-26 11:34:30,295 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-26 11:34:30,295 [ scc.merge] INFO
2024-09-26 11:34:30,295 [ scc.merge] INFO Repository: ome/scripts
2024-09-26 11:34:30,295 [ scc.merge] INFO Excluded PRs:
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-26 11:34:30,295 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-26 11:34:30,295 [ scc.merge] INFO Already up to date.
2024-09-26 11:34:30,296 [ scc.merge] INFO
2024-09-26 11:34:30,296 [ scc.merge] INFO Merged PRs:
2024-09-26 11:34:30,296 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-09-26 11:34:30,296 [ scc.merge] INFO
2024-09-26 11:34:30,296 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-26 11:34:30,296 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-26 11:34:30,296 [ scc.merge] INFO
2024-09-26 11:34:30,296 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-26 11:34:30,296 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-26 11:34:30,303 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-26 11:34:30,309 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-26 11:34:30,316 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-26 11:34:30,322 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-26 11:34:30,329 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-26 11:34:30,335 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-26 11:34:30,342 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-26 11:34:30,348 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-26 11:34:30,355 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-26 11:34:30,361 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-26 11:34:30,366 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-26 11:34:30,372 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-26 11:34:30,378 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-26 11:34:30,384 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-26 11:34:30,390 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-26 11:34:30,396 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-26 11:34:30,402 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-26 11:34:30,408 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-26 11:34:30,414 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-26 11:34:30,420 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-26 11:34:30,426 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-26 11:34:30,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-26 11:34:30,432 [ scc.git] DEBUG Calling 'git remote'
2024-09-26 11:34:30,438 [ 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 e346fcd] 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 8c4b67a] 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-26 11:35:17,604 [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-26 11:35:26,623 [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-26 11:35:28,994 [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-26 11:35:33,559 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-26 11:36:14,986 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/550c3bc3/images/svgs/logo.svg){kind=logo}
