Console Output
Skipping 114 KB..
Full Log,920 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:29,925 [ scc.git] DEBUG omero_figure/views.py | 2 +-
2024-11-19 16:51:29,925 [ scc.git] DEBUG package.json | 2 +-
2024-11-19 16:51:29,925 [ scc.git] DEBUG src/css/figure.css | 12 ++++++++++--
2024-11-19 16:51:29,926 [ scc.git] DEBUG src/index.html | 2 +-
2024-11-19 16:51:29,926 [ scc.git] DEBUG src/js/views/right_panel_view.js | 4 +++-
2024-11-19 16:51:29,926 [ scc.git] DEBUG src/templates/labels_form_inner.template.html | 7 ++++---
2024-11-19 16:51:29,926 [ scc.git] DEBUG 6 files changed, 20 insertions(+), 9 deletions(-)
2024-11-19 16:51:30,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:30,292 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:51:30,328 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:30,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:30,333 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:51:30,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:51:30,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c2bfa0> has no local changes
2024-11-19 16:51:30,375 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 596 Tom-TBT 'Dynamic lut for figure'
- PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
Conflicting PRs (not included):
- PR 595 Rdornier 'Rotate image panel by 90°'
Generated by OMERO-plugins-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:51:30,447 [ scc.git] DEBUG [detached HEAD 377eff34] merge master -Dorg -Ssuccess-only
2024-11-19 16:51:30,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:51:30,448 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:51:30,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-11-19 16:51:31,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-11-19 16:51:31,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-11-19 16:51:32,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-11-19 16:51:32,674 [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-11-19 16:51:33,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-11-19 16:51:33,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:33,507 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-11-19 16:51:33,507 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:51:33,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-19 16:51:33,507 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:33,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:33,513 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:51:33,517 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:51:33,518 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:51:33,522 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:51:33,527 [ scc.git] DEBUG Already up to date.
2024-11-19 16:51:33,528 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-11-19 16:51:33,898 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-11-19 16:51:33,898 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-11-19 16:51:33,902 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:51:33,903 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:33,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:33,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-11-19 16:51:33,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:33,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-11-19 16:51:33,925 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-11-19 16:51:33,934 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:33,936 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-11-19 16:51:33,936 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-11-19 16:51:34,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:34,078 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:51:34,114 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:34,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:34,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:51:34,153 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:51:34,159 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c45d00> has no local changes
2024-11-19 16:51:34,159 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:51:34,166 [ scc.git] DEBUG [detached HEAD 7690441] merge master -Dorg -Ssuccess-only
2024-11-19 16:51:34,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:51:34,166 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:51:34,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-11-19 16:51:35,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-11-19 16:51:35,088 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-19 16:51:35,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-11-19 16:51:36,181 [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-11-19 16:51:36,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-11-19 16:51:37,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:37,033 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-19 16:51:37,033 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:51:37,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-19 16:51:37,033 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:37,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:37,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:51:37,042 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:51:37,042 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:51:37,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:51:37,052 [ scc.git] DEBUG Already up to date.
2024-11-19 16:51:37,052 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-11-19 16:51:37,362 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-19 16:51:37,363 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-11-19 16:51:37,366 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:51:37,367 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:37,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:37,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-11-19 16:51:37,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:37,380 [ 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-11-19 16:51:37,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:37,405 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-11-19 16:51:37,405 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-11-19 16:51:37,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:37,561 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:51:37,597 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:37,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:37,601 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:51:37,636 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:51:37,642 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c16580> has no local changes
2024-11-19 16:51:37,643 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:51:37,651 [ scc.git] DEBUG [detached HEAD 2378c95] merge master -Dorg -Ssuccess-only
2024-11-19 16:51:37,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:51:37,651 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:51:38,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-11-19 16:51:38,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488 HTTP/1.1" 200 None
2024-11-19 16:51:39,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 200 None
2024-11-19 16:51:39,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/34fabdfc76f6060fbe6fc29bea384bd6f934a1ba HTTP/1.1" 200 None
2024-11-19 16:51:39,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/34fabdfc76f6060fbe6fc29bea384bd6f934a1ba/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-19 16:51:40,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/34fabdfc76f6060fbe6fc29bea384bd6f934a1ba/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-19 16:51:40,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/34fabdfc76f6060fbe6fc29bea384bd6f934a1ba HTTP/1.1" 200 None
2024-11-19 16:51:41,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/34fabdfc76f6060fbe6fc29bea384bd6f934a1ba?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:41,273 [ scc.repo] DEBUG - PR 488 will-moore 'Mobile layout'
2024-11-19 16:51:41,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485 HTTP/1.1" 200 None
2024-11-19 16:51:42,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485/comments HTTP/1.1" 200 None
2024-11-19 16:51:42,268 [ scc.repo] DEBUG # ... Include label: include
2024-11-19 16:51:42,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b47822cec4b30f065e8ceb67f98570c307e2b0e6 HTTP/1.1" 200 None
2024-11-19 16:51:43,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b47822cec4b30f065e8ceb67f98570c307e2b0e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-19 16:51:43,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b47822cec4b30f065e8ceb67f98570c307e2b0e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-19 16:51:44,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b47822cec4b30f065e8ceb67f98570c307e2b0e6 HTTP/1.1" 200 None
2024-11-19 16:51:44,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b47822cec4b30f065e8ceb67f98570c307e2b0e6?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:44,465 [ scc.repo] DEBUG - PR 485 Tom-TBT 'Dynamic LUT for iviewer'
2024-11-19 16:51:44,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-19 16:51:45,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-19 16:51:45,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-19 16:51:46,341 [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-11-19 16:51:46,782 [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-11-19 16:51:47,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-19 16:51:47,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:47,622 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-19 16:51:48,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-19 16:51:48,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-19 16:51:49,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-19 16:51:49,614 [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-11-19 16:51:50,074 [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-11-19 16:51:50,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-19 16:51:50,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:50,891 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-19 16:51:51,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-19 16:51:51,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-19 16:51:52,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-19 16:51:52,826 [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-11-19 16:51:53,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-19 16:51:53,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:51:53,668 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-19 16:51:53,668 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:51:53,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-19 16:51:53,669 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:53,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:53,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:51:53,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:51:53,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:51:53,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:51:53,713 [ scc.git] DEBUG Updating a8f380f..4bf017c
2024-11-19 16:51:54,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/495 HTTP/1.1" 200 None
2024-11-19 16:51:54,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/486 HTTP/1.1" 200 None
2024-11-19 16:51:55,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/484 HTTP/1.1" 200 None
2024-11-19 16:51:55,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/494 HTTP/1.1" 200 None
2024-11-19 16:51:56,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/489 HTTP/1.1" 200 None
2024-11-19 16:51:56,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/477 HTTP/1.1" 200 None
2024-11-19 16:51:57,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/482 HTTP/1.1" 200 None
2024-11-19 16:51:57,503 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-19 16:51:57,810 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-19 16:51:57,810 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-19 16:51:57,813 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-19 16:51:58,120 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-19 16:51:58,120 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-19 16:51:58,124 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-19 16:51:58,426 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-19 16:51:58,427 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-19 16:51:58,431 [ scc.git] DEBUG Calling 'git fetch origin pull/485/head'
2024-11-19 16:51:58,708 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-19 16:51:58,709 [ scc.git] DEBUG * branch refs/pull/485/head -> FETCH_HEAD
2024-11-19 16:51:58,712 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-11-19 16:51:58,996 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-19 16:51:58,996 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-11-19 16:51:58,999 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:51:59,000 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:51:59,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:59,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-19 16:51:59,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:59,014 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-19 16:51:59,029 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-19 16:51:59,030 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:59,033 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-19 16:51:59,033 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-19 16:51:59,033 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-19 16:51:59,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:59,165 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-19 16:51:59,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:59,176 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-19 16:51:59,193 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-19 16:51:59,193 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-19 16:51:59,193 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-19 16:51:59,194 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-19 16:51:59,194 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:59,198 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-19 16:51:59,198 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-19 16:51:59,198 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-19 16:51:59,198 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-19 16:51:59,198 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-19 16:51:59,198 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-19 16:51:59,198 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-19 16:51:59,198 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-19 16:51:59,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:59,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-19 16:51:59,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:59,570 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-19 16:51:59,582 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-19 16:51:59,583 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:51:59,585 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-19 16:51:59,585 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-19 16:51:59,585 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-19 16:51:59,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:51:59,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47822cec4b30f065e8ceb67f98570c307e2b0e6'
2024-11-19 16:51:59,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:51:59,971 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 485 (Dynamic LUT for iviewer) b47822cec4b30f065e8ceb67f98570c307e2b0e6'
2024-11-19 16:51:59,985 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-19 16:51:59,985 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-19 16:52:00,002 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:00,006 [ scc.git] DEBUG src/app/context.js | 54 +++++++++++++++++++++++++++-----------------------
2024-11-19 16:52:00,006 [ scc.git] DEBUG src/utils/constants.js | 46 ------------------------------------------
2024-11-19 16:52:00,006 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 71 deletions(-)
2024-11-19 16:52:00,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:00,346 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...34fabdfc76f6060fbe6fc29bea384bd6f934a1ba'
2024-11-19 16:52:00,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:00,357 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 34fabdfc76f6060fbe6fc29bea384bd6f934a1ba'
2024-11-19 16:52:00,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:00,375 [ scc.git] DEBUG css/app.css | 100 +++++++++++++++++++++------
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/app/index.html | 2 +-
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/app/thumbnail-slider.html | 6 +-
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/app/thumbnail-slider.js | 3 -
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/index-dev.html | 1 +
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/index.html | 1 +
2024-11-19 16:52:00,375 [ scc.git] DEBUG src/utils/ui.js | 154 +++++++++++++++++-------------------------
2024-11-19 16:52:00,375 [ scc.git] DEBUG 7 files changed, 147 insertions(+), 120 deletions(-)
2024-11-19 16:52:00,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:00,741 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:00,776 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:00,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:00,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:00,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:00,824 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c164f0> has no local changes
2024-11-19 16:52:00,824 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Updating a8f380f..4bf017c
Previously merged:
- PR 495 dependabot[bot] 'Bump cookie and socket.io'
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 484 barrettMCW 'improved mirroring'
- PR 494 dependabot[bot] 'Bump webpack from 5.82.0 to 5.96.1'
- PR 489 dependabot[bot] 'Bump send and express'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
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 485 Tom-TBT 'Dynamic LUT for iviewer'
- PR 488 will-moore 'Mobile layout'
Generated by OMERO-plugins-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:00,833 [ scc.git] DEBUG [detached HEAD 705dd60] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:00,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:00,834 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:01,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-19 16:52:01,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/90 HTTP/1.1" 200 None
2024-11-19 16:52:02,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-19 16:52:02,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-19 16:52:03,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-19 16:52:03,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-19 16:52:04,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/ba2a65ad3901b65582775beda60b288e225b1003?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:04,095 [ scc.repo] DEBUG - PR 90 jburel 'Update gha'
2024-11-19 16:52:04,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-19 16:52:05,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-19 16:52:05,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-19 16:52:05,974 [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-11-19 16:52:06,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-19 16:52:06,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:06,802 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-19 16:52:06,802 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:06,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-19 16:52:06,802 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:06,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:06,808 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:06,813 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:06,813 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:06,818 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:06,823 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:06,824 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-19 16:52:07,119 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-19 16:52:07,119 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-19 16:52:07,124 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-11-19 16:52:07,430 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-19 16:52:07,430 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-11-19 16:52:07,434 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:07,434 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:07,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:07,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-19 16:52:07,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:07,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-19 16:52:07,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:07,461 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-19 16:52:07,461 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-19 16:52:07,461 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-19 16:52:07,461 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-19 16:52:07,461 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-19 16:52:07,461 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-19 16:52:07,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:07,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-19 16:52:07,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:07,626 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Update gha) ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-19 16:52:07,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:07,637 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-19 16:52:07,637 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-19 16:52:07,637 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-19 16:52:07,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:07,999 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:08,034 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:08,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:08,038 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:08,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:08,079 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc643c6370> has no local changes
2024-11-19 16:52:08,079 [ 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'
- PR 90 jburel 'Update gha'
Generated by OMERO-plugins-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:08,087 [ scc.git] DEBUG [detached HEAD 2cbcda2] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:08,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:08,087 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:08,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-19 16:52:09,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/88 HTTP/1.1" 200 None
2024-11-19 16:52:09,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-19 16:52:10,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-19 16:52:10,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-19 16:52:10,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-19 16:52:11,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/295b3c79ae9a35f8c588400f25e14fbcab329926?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:11,304 [ scc.repo] DEBUG - PR 88 jburel 'Update gha'
2024-11-19 16:52:11,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-19 16:52:12,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-19 16:52:12,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-19 16:52:13,248 [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-11-19 16:52:13,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-19 16:52:14,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:14,143 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-19 16:52:14,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-19 16:52:15,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-19 16:52:15,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-19 16:52:15,998 [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-11-19 16:52:16,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-19 16:52:16,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:16,840 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-19 16:52:16,840 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:16,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-19 16:52:16,841 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:16,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:16,847 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:16,851 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:16,852 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:16,857 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:16,862 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:16,862 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-19 16:52:17,173 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-19 16:52:17,173 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-19 16:52:17,177 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-19 16:52:17,479 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-19 16:52:17,479 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-19 16:52:17,482 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-11-19 16:52:17,791 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-19 16:52:17,791 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-11-19 16:52:17,794 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:17,794 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:17,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:17,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-19 16:52:17,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:17,810 [ 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-11-19 16:52:17,823 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-19 16:52:17,823 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-19 16:52:17,823 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-19 16:52:17,823 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-19 16:52:17,823 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:52:17,823 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:52:17,828 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-19 16:52:17,834 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-19 16:52:17,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:17,978 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-19 16:52:17,984 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-19 16:52:17,989 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-11-19 16:52:17,993 [ scc.config] DEBUG Found github.token
2024-11-19 16:52:17,994 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-19 16:52:17,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-19 16:52:18,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:18,004 [ 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-11-19 16:52:18,019 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-19 16:52:18,019 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-19 16:52:18,019 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-19 16:52:18,019 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:52:18,020 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:52:18,025 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-19 16:52:18,031 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-19 16:52:18,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:18,402 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-19 16:52:18,408 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-19 16:52:18,413 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/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-11-19 16:52:18,417 [ scc.config] DEBUG Found github.token
2024-11-19 16:52:18,417 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-19 16:52:18,418 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-19 16:52:18,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:18,427 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Update gha) 295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-19 16:52:18,437 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:18,439 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-19 16:52:18,439 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-19 16:52:18,439 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-19 16:52:18,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:18,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:18,829 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:18,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:18,833 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:18,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:18,873 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c06a30> has no local changes
2024-11-19 16:52:18,873 [ 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 88 jburel 'Update gha'
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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:18,881 [ scc.git] DEBUG [detached HEAD ca4e82b] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:18,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:18,882 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:19,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-19 16:52:19,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-11-19 16:52:19,820 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-19 16:52:20,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-19 16:52:20,815 [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-11-19 16:52:21,436 [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-11-19 16:52:21,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-19 16:52:22,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:22,291 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-19 16:52:22,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-11-19 16:52:22,752 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-19 16:52:23,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-19 16:52:23,812 [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-11-19 16:52:24,276 [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-11-19 16:52:24,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-19 16:52:25,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:25,136 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-19 16:52:25,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-11-19 16:52:25,620 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-19 16:52:26,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-19 16:52:26,616 [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-11-19 16:52:27,047 [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-11-19 16:52:27,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-19 16:52:27,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:27,879 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-19 16:52:28,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-19 16:52:28,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-19 16:52:29,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-19 16:52:29,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-19 16:52:30,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-19 16:52:30,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-19 16:52:30,773 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:30,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-19 16:52:30,773 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:30,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:30,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:30,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:30,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:30,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:30,794 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:30,794 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-11-19 16:52:31,123 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-19 16:52:31,124 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-11-19 16:52:31,128 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-11-19 16:52:31,411 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-19 16:52:31,411 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-11-19 16:52:31,414 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-11-19 16:52:31,692 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-19 16:52:31,692 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-11-19 16:52:31,696 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:31,697 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:31,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:31,701 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-19 16:52:31,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:31,711 [ 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-11-19 16:52:31,719 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:31,722 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-11-19 16:52:31,722 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-11-19 16:52:31,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:31,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-19 16:52:31,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:31,866 [ 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-11-19 16:52:31,877 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-19 16:52:31,890 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:31,893 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-11-19 16:52:31,893 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-11-19 16:52:32,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:32,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-19 16:52:32,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:32,253 [ 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-11-19 16:52:32,263 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-19 16:52:32,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:32,266 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-11-19 16:52:32,266 [ scc.git] DEBUG package.json | 2 +-
2024-11-19 16:52:32,267 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-11-19 16:52:32,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:32,630 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:32,665 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:32,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:32,669 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:32,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:32,709 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc6436e640> has no local changes
2024-11-19 16:52:32,709 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:32,717 [ scc.git] DEBUG [detached HEAD 6b0e1de] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:32,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:32,717 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:33,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-19 16:52:33,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-19 16:52:34,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-19 16:52:34,502 [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-11-19 16:52:35,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-19 16:52:35,439 [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-11-19 16:52:35,439 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-19 16:52:35,439 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:35,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-19 16:52:35,439 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:35,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:35,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:35,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:35,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:35,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:35,460 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:35,460 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-19 16:52:35,767 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-19 16:52:35,768 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-19 16:52:35,771 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:35,772 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:35,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:35,776 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-19 16:52:35,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:35,786 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-19 16:52:35,794 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:35,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:35,965 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:36,000 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:36,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:36,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:36,041 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:36,046 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc6437fbe0> has no local changes
2024-11-19 16:52:36,046 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:36,053 [ scc.git] DEBUG [detached HEAD 2e9ddd4] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:36,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:36,054 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:36,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-19 16:52:36,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-19 16:52:37,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-19 16:52:37,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-19 16:52:38,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-19 16:52:38,864 [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-11-19 16:52:39,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-19 16:52:39,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:39,774 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-19 16:52:39,774 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:39,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-19 16:52:39,774 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:39,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:39,780 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:39,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:39,785 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:39,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:39,795 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:39,795 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-19 16:52:40,108 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-19 16:52:40,108 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-19 16:52:40,112 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:40,112 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:40,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:40,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-19 16:52:40,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:40,127 [ 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-11-19 16:52:40,136 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-19 16:52:40,137 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:40,139 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-19 16:52:40,139 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-19 16:52:40,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:40,279 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:40,315 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:40,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:40,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:40,354 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:40,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc643277f0> has no local changes
2024-11-19 16:52:40,359 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:40,367 [ scc.git] DEBUG [detached HEAD cb45184] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:40,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:40,367 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:40,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-19 16:52:41,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-19 16:52:41,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-19 16:52:42,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-19 16:52:42,646 [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-11-19 16:52:43,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-19 16:52:43,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:43,463 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-19 16:52:43,463 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:43,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-19 16:52:43,464 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:43,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:43,469 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:43,474 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:43,474 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:43,479 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:43,484 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:43,484 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-19 16:52:43,805 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-19 16:52:43,805 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-19 16:52:43,808 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:43,808 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:43,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:43,813 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-19 16:52:43,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:43,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-19 16:52:43,833 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG Auto-merging setup.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-19 16:52:43,833 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:52:43,833 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:52:43,838 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-19 16:52:43,844 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-19 16:52:43,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:43,979 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-19 16:52:43,984 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-19 16:52:43,989 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-11-19 16:52:43,993 [ scc.config] DEBUG Found github.token
2024-11-19 16:52:43,993 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-19 16:52:43,993 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:44,028 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:44,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:44,033 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:44,068 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:44,074 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64327670> has no local changes
2024-11-19 16:52:44,074 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:44,081 [ scc.git] DEBUG [detached HEAD a94c5b1] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:44,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:44,082 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:44,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-19 16:52:44,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-19 16:52:45,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-19 16:52:45,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-19 16:52:46,382 [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-11-19 16:52:46,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-19 16:52:47,250 [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-11-19 16:52:47,251 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-19 16:52:47,251 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:47,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-19 16:52:47,251 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:47,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:47,257 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:47,261 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:47,261 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:47,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:47,271 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:47,271 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-19 16:52:47,607 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-19 16:52:47,607 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-19 16:52:47,611 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:47,611 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:47,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:47,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-19 16:52:47,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:47,627 [ 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-11-19 16:52:47,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-19 16:52:47,641 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-19 16:52:47,643 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-19 16:52:47,643 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-19 16:52:47,643 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-19 16:52:47,643 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-19 16:52:47,643 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-19 16:52:47,644 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-19 16:52:47,644 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-19 16:52:47,644 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-19 16:52:47,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:47,811 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:47,846 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:47,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:47,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:47,886 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:47,892 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64338bb0> has no local changes
2024-11-19 16:52:47,892 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:47,901 [ scc.git] DEBUG [detached HEAD d117455] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:47,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:47,901 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:48,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-19 16:52:48,263 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:48,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-19 16:52:48,264 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,268 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:48,273 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:48,273 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:48,278 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:48,283 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:48,283 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:48,283 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,287 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:48,322 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:48,360 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:48,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc642fc2e0> has no local changes
2024-11-19 16:52:48,365 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:48,396 [ scc.git] DEBUG [detached HEAD 33d7f89] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:48,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:48,397 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:48,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-11-19 16:52:48,693 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:48,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-19 16:52:48,693 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:48,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:48,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:48,708 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:48,712 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:48,713 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:48,713 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,717 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:48,752 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:48,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:48,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:48,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:48,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64389e50> has no local changes
2024-11-19 16:52:48,795 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:48,802 [ scc.git] DEBUG [detached HEAD 00e29e5] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:48,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:48,803 [ scc.git] INFO Overriding base-branch from master to main
2024-11-19 16:52:48,803 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:49,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-19 16:52:49,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-19 16:52:50,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-19 16:52:50,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-19 16:52:51,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-19 16:52:51,707 [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-11-19 16:52:52,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-19 16:52:52,524 [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-11-19 16:52:52,524 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-19 16:52:52,524 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:52,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-19 16:52:52,525 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:52,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:52,530 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-19 16:52:52,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:52,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-19 16:52:52,540 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-19 16:52:52,545 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:52,545 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-19 16:52:52,868 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-19 16:52:52,868 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-19 16:52:52,872 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:52,873 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:52,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:52,878 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-19 16:52:52,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:52,887 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-19 16:52:52,895 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-19 16:52:52,895 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-19 16:52:52,895 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:52:52,896 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:52:52,901 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-19 16:52:52,906 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-19 16:52:53,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:53,070 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-19 16:52:53,075 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-19 16:52:53,079 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-19 16:52:53,084 [ scc.config] DEBUG Found github.token
2024-11-19 16:52:53,084 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-19 16:52:53,084 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:53,118 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:53,157 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:53,162 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64397fa0> has no local changes
2024-11-19 16:52:53,162 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:53,169 [ scc.git] DEBUG [detached HEAD 856ca3f] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:53,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:53,170 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:53,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-19 16:52:53,497 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:53,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-19 16:52:53,497 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,502 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:53,506 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:53,507 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:53,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:53,516 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:53,516 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:53,516 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,521 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:53,555 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:53,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:53,599 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc64c45dc0> has no local changes
2024-11-19 16:52:53,599 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:53,606 [ scc.git] DEBUG [detached HEAD ae49c09] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:53,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:53,607 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:53,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-19 16:52:53,917 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:53,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-19 16:52:53,918 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:53,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:53,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:53,931 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:53,936 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:53,936 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:53,937 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,941 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:53,975 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:53,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:53,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:54,014 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:54,020 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc642b6640> has no local changes
2024-11-19 16:52:54,020 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:54,027 [ scc.git] DEBUG [detached HEAD 1d95b3d] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:54,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:54,027 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:54,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-19 16:52:54,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-19 16:52:55,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-19 16:52:55,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-19 16:52:56,213 [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-11-19 16:52:56,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-19 16:52:57,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:52:57,070 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-19 16:52:57,070 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:52:57,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-19 16:52:57,070 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:57,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:57,076 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-19 16:52:57,081 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:52:57,081 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-19 16:52:57,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-19 16:52:57,091 [ scc.git] DEBUG Already up to date.
2024-11-19 16:52:57,091 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-19 16:52:57,442 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-19 16:52:57,442 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-19 16:52:57,446 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:52:57,446 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:57,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:57,451 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-19 16:52:57,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:57,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-19 16:52:57,470 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-19 16:52:57,470 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-19 16:52:57,470 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:52:57,470 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:52:57,475 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-19 16:52:57,482 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-19 16:52:57,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:52:57,620 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-19 16:52:57,625 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-19 16:52:57,630 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-19 16:52:57,634 [ scc.config] DEBUG Found github.token
2024-11-19 16:52:57,634 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-19 16:52:57,634 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:52:57,669 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:52:57,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:52:57,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:52:57,708 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:52:57,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc6430f340> has no local changes
2024-11-19 16:52:57,714 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:52:57,722 [ scc.git] DEBUG [detached HEAD c708535] merge master -Dorg -Ssuccess-only
2024-11-19 16:52:57,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:52:57,722 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-19 16:52:57,722 [ scc.repo] DEBUG ## PRs found:
2024-11-19 16:52:58,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-19 16:52:58,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-19 16:52:59,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-19 16:52:59,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-19 16:53:00,147 [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-11-19 16:53:00,653 [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-11-19 16:53:01,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-19 16:53:01,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:53:01,518 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-19 16:53:01,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-19 16:53:02,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-19 16:53:03,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-19 16:53:03,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-19 16:53:04,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-19 16:53:04,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-19 16:53:05,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-19 16:53:05,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-19 16:53:05,918 [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-11-19 16:53:06,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-19 16:53:06,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-19 16:53:06,791 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-19 16:53:07,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-19 16:53:07,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-19 16:53:08,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-19 16:53:08,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-19 16:53:08,929 [ scc.repo] DEBUG ## Branches found:
2024-11-19 16:53:08,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-19 16:53:08,930 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:53:08,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:53:08,935 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-19 16:53:08,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-19 16:53:08,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-19 16:53:08,945 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-19 16:53:08,950 [ scc.git] DEBUG Already up to date.
2024-11-19 16:53:08,951 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-19 16:53:09,277 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-19 16:53:09,277 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-19 16:53:09,281 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-19 16:53:09,598 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-19 16:53:09,599 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-19 16:53:09,602 [ scc.git] DEBUG ## Unique users: []
2024-11-19 16:53:09,602 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:53:09,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:53:09,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-19 16:53:09,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:53:09,618 [ 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-11-19 16:53:09,628 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-19 16:53:09,628 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-19 16:53:09,628 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-19 16:53:09,629 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-19 16:53:09,633 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-19 16:53:09,639 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-19 16:53:09,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:09,834 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-19 16:53:09,841 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-19 16:53:09,846 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-19 16:53:09,850 [ scc.config] DEBUG Found github.token
2024-11-19 16:53:09,851 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-19 16:53:09,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-19 16:53:09,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:53:09,860 [ 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-11-19 16:53:09,869 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-19 16:53:09,871 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-19 16:53:09,871 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-19 16:53:10,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:10,223 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-19 16:53:10,259 [ scc.git] DEBUG Get sha1 of %s
2024-11-19 16:53:10,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-19 16:53:10,264 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:53:10,297 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:53:10,303 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc642c6e20> has no local changes
2024-11-19 16:53:10,303 [ 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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:53:10,311 [ scc.git] DEBUG [detached HEAD c178f3b] merge master -Dorg -Ssuccess-only
2024-11-19 16:53:10,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:10,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-19 16:53:10,381 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-19 16:53:10,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:10,646 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-19 16:53:10,650 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-19 16:53:11,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:11,027 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-19 16:53:11,031 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-19 16:53:11,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:11,432 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-19 16:53:11,436 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-19 16:53:11,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:11,825 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-19 16:53:12,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:12,213 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-19 16:53:12,217 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-19 16:53:12,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:12,638 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-19 16:53:12,643 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-19 16:53:13,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:13,028 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-19 16:53:13,033 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-19 16:53:13,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:13,443 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-19 16:53:13,447 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-19 16:53:13,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:13,827 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-19 16:53:13,832 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-19 16:53:14,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:14,217 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-19 16:53:14,221 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-19 16:53:14,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:14,625 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-19 16:53:14,629 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-19 16:53:15,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:15,023 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-19 16:53:15,027 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-19 16:53:15,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:15,419 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-19 16:53:15,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:15,809 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-19 16:53:16,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:16,197 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-19 16:53:16,201 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-19 16:53:16,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:16,587 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-19 16:53:16,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:16,973 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-19 16:53:17,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:17,363 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-19 16:53:17,367 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-19 16:53:17,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:17,752 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-19 16:53:17,757 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-19 16:53:18,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:18,145 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-19 16:53:18,150 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-19 16:53:18,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:18,539 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-19 16:53:18,543 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-19 16:53:18,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-19 16:53:18,926 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-19 16:53:18,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-19 16:53:18,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc6815b820> has local changes
2024-11-19 16:53:19,000 [ 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 398 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `d9953e4`'
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'
- PR 67 sbesson 'omero render set: clarify help around settings for disabled channels'
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 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 596 Tom-TBT 'Dynamic lut for figure'
- PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
Conflicting PRs (not included):
- PR 595 Rdornier 'Rotate image panel by 90°'
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 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Updating a8f380f..4bf017c
Previously merged:
- PR 495 dependabot[bot] 'Bump cookie and socket.io'
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 484 barrettMCW 'improved mirroring'
- PR 494 dependabot[bot] 'Bump webpack from 5.82.0 to 5.96.1'
- PR 489 dependabot[bot] 'Bump send and express'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
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 485 Tom-TBT 'Dynamic LUT for iviewer'
- PR 488 will-moore 'Mobile layout'
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'
- PR 90 jburel 'Update gha'
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 88 jburel 'Update gha'
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#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/250/)'
2024-11-19 16:53:19,013 [ scc.git] DEBUG [detached HEAD d160f3c] merge master -Dorg -Ssuccess-only
2024-11-19 16:53:19,013 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-19 16:53:19,013 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-19 16:53:19,013 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,013 [ scc.merge] INFO
2024-11-19 16:53:19,013 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,013 [ scc.merge] INFO - PR 398 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `d9953e4`'
2024-11-19 16:53:19,013 [ scc.merge] INFO
2024-11-19 16:53:19,013 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-19 16:53:19,013 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,013 [ scc.merge] INFO
2024-11-19 16:53:19,013 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,013 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-11-19 16:53:19,013 [ scc.merge] INFO
2024-11-19 16:53:19,013 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-19 16:53:19,013 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,013 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-19 16:53:19,013 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,013 [ scc.merge] INFO
2024-11-19 16:53:19,013 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-19 16:53:19,014 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-11-19 16:53:19,014 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 67 sbesson 'omero render set: clarify help around settings for disabled channels'
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-19 16:53:19,014 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-19 16:53:19,014 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-19 16:53:19,014 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-19 16:53:19,014 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,014 [ scc.merge] INFO
2024-11-19 16:53:19,014 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-19 16:53:19,014 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-19 16:53:19,015 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-19 16:53:19,015 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-19 16:53:19,015 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-19 16:53:19,015 [ scc.merge] INFO Updating a8f380f..4bf017c
2024-11-19 16:53:19,015 [ scc.merge] INFO Previously merged:
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 495 dependabot[bot] 'Bump cookie and socket.io'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 494 dependabot[bot] 'Bump webpack from 5.82.0 to 5.96.1'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 489 dependabot[bot] 'Bump send and express'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-19 16:53:19,015 [ scc.merge] INFO
2024-11-19 16:53:19,015 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-19 16:53:19,015 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-19 16:53:19,016 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-19 16:53:19,016 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 90 jburel 'Update gha'
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-19 16:53:19,016 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 88 jburel 'Update gha'
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-19 16:53:19,016 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-19 16:53:19,016 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-19 16:53:19,016 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,016 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-19 16:53:19,016 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,016 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-19 16:53:19,017 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-19 16:53:19,017 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-19 16:53:19,017 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,017 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,017 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-19 16:53:19,017 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-19 16:53:19,018 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-19 16:53:19,018 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-19 16:53:19,018 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Repository: ome/scripts
2024-11-19 16:53:19,018 [ scc.merge] INFO Excluded PRs:
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-19 16:53:19,018 [ scc.merge] INFO Already up to date.
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Merged PRs:
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-19 16:53:19,018 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-19 16:53:19,018 [ scc.merge] INFO
2024-11-19 16:53:19,018 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-19 16:53:19,018 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-19 16:53:19,023 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-19 16:53:19,027 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-19 16:53:19,032 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-19 16:53:19,037 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-19 16:53:19,042 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-19 16:53:19,046 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-19 16:53:19,051 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-19 16:53:19,055 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-19 16:53:19,060 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-19 16:53:19,065 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-19 16:53:19,069 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-19 16:53:19,074 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-19 16:53:19,078 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-19 16:53:19,083 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-19 16:53:19,087 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-19 16:53:19,092 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-19 16:53:19,097 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-19 16:53:19,101 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-19 16:53:19,106 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-19 16:53:19,110 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-19 16:53:19,115 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-19 16:53:19,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-19 16:53:19,120 [ scc.git] DEBUG Calling 'git remote'
2024-11-19 16:53:19,124 [ 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 e751592] 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 24444fe6
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 d9953e4
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from fc20959
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 962798f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-11-19 16:54:02,834 [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-11-19 16:54:11,849 [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-11-19 16:54:14,252 [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-11-19 16:54:18,753 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-19 16:54:58,001 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci