Console Output
Skipping 117 KB..
Full Log?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:18,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:19,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427 HTTP/1.1" 200 None
2024-11-07 00:46:19,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/767995856fdb93be4060423195f3f604aa6e4427?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:19,433 [ scc.repo] DEBUG - PR 488 will-moore 'Mobile layout'
2024-11-07 00:46:19,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/486 HTTP/1.1" 200 None
2024-11-07 00:46:20,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485 HTTP/1.1" 200 None
2024-11-07 00:46:20,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485/comments HTTP/1.1" 200 None
2024-11-07 00:46:21,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484 HTTP/1.1" 200 None
2024-11-07 00:46:21,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-11-07 00:46:21,754 [ scc.repo] DEBUG # ... Include label: include
2024-11-07 00:46:22,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-07 00:46:22,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:23,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:23,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-07 00:46:24,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:24,071 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-11-07 00:46:24,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-11-07 00:46:24,567 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:46:25,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-07 00:46:25,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:26,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:26,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-07 00:46:27,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:27,193 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-07 00:46:27,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-11-07 00:46:28,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-11-07 00:46:28,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-07 00:46:29,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:29,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:30,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-07 00:46:30,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:30,631 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-07 00:46:31,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-11-07 00:46:31,075 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:46:31,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-07 00:46:32,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:32,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:33,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-07 00:46:33,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:33,868 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-07 00:46:34,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-11-07 00:46:34,354 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:46:34,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-07 00:46:35,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:46:35,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:46:36,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-07 00:46:36,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:46:36,914 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-07 00:46:37,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-07 00:46:37,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-07 00:46:38,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-07 00:46:38,809 [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-07 00:46:39,295 [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-07 00:46:39,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-07 00:46:40,180 [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-07 00:46:40,181 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-07 00:46:40,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-07 00:46:41,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-07 00:46:41,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-07 00:46:42,074 [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-07 00:46:42,512 [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-07 00:46:43,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-07 00:46:43,458 [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-07 00:46:43,459 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-07 00:46:43,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-07 00:46:44,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-07 00:46:44,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-07 00:46:45,400 [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-07 00:46:45,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-07 00:46:46,385 [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-07 00:46:46,386 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-07 00:46:46,386 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:46:46,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-07 00:46:46,386 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:46:46,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:46,393 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:46:46,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:46:46,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:46:46,404 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:46:46,409 [ scc.git] DEBUG Already up to date.
2024-11-07 00:46:46,409 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-07 00:46:46,952 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:46,952 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-07 00:46:46,958 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-07 00:46:48,183 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:48,184 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-07 00:46:48,189 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-07 00:46:48,578 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:48,579 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-07 00:46:48,583 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-11-07 00:46:48,876 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:48,877 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-11-07 00:46:48,881 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-11-07 00:46:49,177 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:49,177 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-11-07 00:46:49,182 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-11-07 00:46:49,524 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:49,524 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-11-07 00:46:49,529 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-11-07 00:46:49,808 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:49,808 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-11-07 00:46:49,812 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-11-07 00:46:51,323 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:51,324 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-11-07 00:46:51,329 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-11-07 00:46:51,898 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-07 00:46:51,898 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-11-07 00:46:51,903 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:46:51,903 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:46:51,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:51,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-07 00:46:51,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:51,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-07 00:46:52,100 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-07 00:46:52,101 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:52,105 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-07 00:46:52,105 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-07 00:46:52,105 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-07 00:46:52,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:52,239 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-07 00:46:52,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:52,253 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-07 00:46:52,539 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-07 00:46:52,540 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-07 00:46:52,540 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-07 00:46:52,540 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-07 00:46:52,540 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:52,545 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-07 00:46:52,545 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-07 00:46:52,545 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-07 00:46:52,545 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-07 00:46:52,545 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-07 00:46:52,545 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-07 00:46:52,545 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-07 00:46:52,545 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-07 00:46:52,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:52,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-07 00:46:52,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:52,692 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-07 00:46:52,896 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-07 00:46:52,897 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:52,900 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-07 00:46:52,900 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-07 00:46:52,901 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-07 00:46:53,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:53,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-07 00:46:53,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:53,077 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-07 00:46:53,108 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:53,117 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-11-07 00:46:53,117 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-11-07 00:46:53,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:53,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-07 00:46:53,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:53,468 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-07 00:46:53,602 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-07 00:46:53,603 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:53,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:53,849 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-07 00:46:53,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:53,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-07 00:46:54,326 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-07 00:46:54,326 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-07 00:46:54,326 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-07 00:46:54,326 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-11-07 00:46:54,331 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-11-07 00:46:54,331 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-11-07 00:46:54,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:54,488 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-07 00:46:54,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:54,503 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-07 00:46:54,797 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-07 00:46:54,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:54,813 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-11-07 00:46:54,813 [ scc.git] DEBUG package.json | 2 +-
2024-11-07 00:46:54,813 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-11-07 00:46:54,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:54,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-07 00:46:54,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:54,968 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-07 00:46:55,030 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:46:55,033 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-11-07 00:46:55,033 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-11-07 00:46:55,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:55,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-11-07 00:46:55,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:55,354 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-07 00:46:55,588 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-11-07 00:46:55,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-11-07 00:46:55,588 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:46:55,589 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:46:55,595 [ scc.git] DEBUG Calling 'git reset --hard c662a90b3a59009bc8daf1774a613d8abcc3dd12'
2024-11-07 00:46:55,602 [ scc.git] DEBUG HEAD is now at c662a90 merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-11-07 00:46:55,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:46:55,734 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-07 00:46:55,740 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-11-07 00:46:55,745 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- PR #482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- src/utils/ui.js
--conflicts
2024-11-07 00:46:55,750 [ scc.config] DEBUG Found github.token
2024-11-07 00:46:55,750 [ scc.git] DEBUG Adding comment to issue #488.
2024-11-07 00:46:56,561 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-11-07 00:46:56,563 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:46:56,602 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:46:56,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:46:56,608 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:46:56,648 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:46:56,656 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0f5f520> has no local changes
2024-11-07 00:46:56,657 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
- PR 484 barrettMCW 'improved mirroring'
Conflicting PRs (not included):
- PR 488 will-moore 'Mobile layout'
Generated by OMERO-plugins-push#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:46:56,666 [ scc.git] DEBUG [detached HEAD fc8f767] merge master -Dorg -Ssuccess-only
2024-11-07 00:46:56,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:46:56,667 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:46:57,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-07 00:46:57,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/90 HTTP/1.1" 200 None
2024-11-07 00:46:58,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-07 00:46:58,542 [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-07 00:46:59,004 [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-07 00:46:59,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-07 00:46:59,932 [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-07 00:46:59,933 [ scc.repo] DEBUG - PR 90 jburel 'Update gha'
2024-11-07 00:47:00,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-11-07 00:47:00,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-11-07 00:47:01,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-07 00:47:01,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-07 00:47:02,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-07 00:47:02,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-07 00:47:03,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/8281624292868ccde51de5ce6c40b155b8b36893?per_page=1 HTTP/1.1" 200 2
2024-11-07 00:47:03,119 [ scc.repo] DEBUG - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-07 00:47:03,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-07 00:47:04,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-07 00:47:04,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-07 00:47:05,036 [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-07 00:47:05,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-07 00:47:05,974 [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-07 00:47:05,975 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-07 00:47:05,975 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:05,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-07 00:47:05,975 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:05,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:05,982 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:05,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:05,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:05,993 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:05,998 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:05,998 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-07 00:47:06,363 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-07 00:47:06,363 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-07 00:47:06,369 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-11-07 00:47:06,871 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-07 00:47:06,871 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-11-07 00:47:06,876 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-11-07 00:47:07,302 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-07 00:47:07,303 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-11-07 00:47:07,307 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:07,308 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:07,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:07,313 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-07 00:47:07,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:07,324 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-07 00:47:07,334 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:07,336 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-07 00:47:07,337 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-07 00:47:07,337 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-07 00:47:07,337 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-07 00:47:07,337 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-07 00:47:07,337 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-07 00:47:07,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:07,477 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8281624292868ccde51de5ce6c40b155b8b36893'
2024-11-07 00:47:07,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:07,490 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (fix return of default favicon if not found) 8281624292868ccde51de5ce6c40b155b8b36893'
2024-11-07 00:47:07,518 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:07,521 [ scc.git] DEBUG omero_mapr/views.py | 5 +++--
2024-11-07 00:47:07,521 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-07 00:47:07,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:07,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-07 00:47:07,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:07,873 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Update gha) ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-07 00:47:07,909 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:07,912 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-07 00:47:07,912 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-07 00:47:07,912 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-07 00:47:08,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:08,242 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:08,287 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:08,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:08,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:08,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:08,344 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0739310> has no local changes
2024-11-07 00:47:08,344 [ 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 86 will-moore 'fix return of default favicon if not found'
- PR 90 jburel 'Update gha'
Generated by OMERO-plugins-push#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:08,353 [ scc.git] DEBUG [detached HEAD 4074d0b] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:08,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:08,353 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:08,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-07 00:47:09,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/88 HTTP/1.1" 200 None
2024-11-07 00:47:09,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-07 00:47:10,216 [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-07 00:47:10,704 [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-07 00:47:11,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-07 00:47:11,637 [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-07 00:47:11,638 [ scc.repo] DEBUG - PR 88 jburel 'Update gha'
2024-11-07 00:47:12,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-07 00:47:12,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-07 00:47:13,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-07 00:47:13,585 [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-07 00:47:14,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-07 00:47:14,468 [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-07 00:47:14,468 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-07 00:47:14,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-07 00:47:15,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-07 00:47:15,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-07 00:47:16,391 [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-07 00:47:16,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-07 00:47:17,298 [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-07 00:47:17,299 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-07 00:47:17,299 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:17,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-07 00:47:17,299 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:17,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:17,306 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:17,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:17,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:17,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:17,322 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:17,322 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-07 00:47:17,984 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-07 00:47:17,984 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-07 00:47:17,989 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-07 00:47:18,535 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-07 00:47:18,535 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-07 00:47:18,539 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-11-07 00:47:18,922 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-07 00:47:18,922 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-11-07 00:47:18,927 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:18,927 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:18,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:18,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-07 00:47:18,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:18,945 [ 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-07 00:47:19,133 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-07 00:47:19,133 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-07 00:47:19,133 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-07 00:47:19,133 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-07 00:47:19,134 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:47:19,134 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:47:19,141 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-07 00:47:19,148 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-07 00:47:19,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:19,288 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-07 00:47:19,296 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-07 00:47:19,383 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-11-07 00:47:19,388 [ scc.config] DEBUG Found github.token
2024-11-07 00:47:19,389 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-07 00:47:19,389 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-07 00:47:19,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:19,400 [ 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-07 00:47:19,503 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-07 00:47:19,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-07 00:47:19,504 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-07 00:47:19,504 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:47:19,504 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:47:19,510 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-07 00:47:19,518 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-07 00:47:19,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:19,668 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-07 00:47:19,676 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-07 00:47:19,682 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/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-07 00:47:19,686 [ scc.config] DEBUG Found github.token
2024-11-07 00:47:19,687 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-07 00:47:19,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-07 00:47:19,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:19,696 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Update gha) 295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-07 00:47:19,737 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:19,740 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-07 00:47:19,740 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-07 00:47:19,740 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-07 00:47:20,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:20,057 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:20,099 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:20,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:20,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:20,145 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:20,152 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0f98be0> has no local changes
2024-11-07 00:47:20,152 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:20,160 [ scc.git] DEBUG [detached HEAD 598b680] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:20,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:20,161 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:20,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-07 00:47:21,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-11-07 00:47:21,202 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:47:21,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-07 00:47:22,282 [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-07 00:47:22,787 [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-07 00:47:23,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-07 00:47:23,786 [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-07 00:47:23,787 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-07 00:47:24,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-11-07 00:47:24,252 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:47:24,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-07 00:47:25,239 [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-07 00:47:25,737 [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-07 00:47:26,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-07 00:47:26,659 [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-07 00:47:26,660 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-07 00:47:27,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-11-07 00:47:27,125 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-07 00:47:27,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-07 00:47:28,165 [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-07 00:47:28,626 [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-07 00:47:29,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-07 00:47:29,543 [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-07 00:47:29,544 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-07 00:47:30,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-07 00:47:30,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-07 00:47:30,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-07 00:47:31,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-07 00:47:31,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-07 00:47:32,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-07 00:47:32,407 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:32,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-07 00:47:32,408 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:32,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:32,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:32,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:32,420 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:32,425 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:32,431 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:32,431 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-11-07 00:47:32,733 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-07 00:47:32,734 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-11-07 00:47:32,738 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-11-07 00:47:33,037 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-07 00:47:33,038 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-11-07 00:47:33,042 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-11-07 00:47:33,330 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-07 00:47:33,330 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-11-07 00:47:33,335 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:33,335 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:33,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:33,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-07 00:47:33,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:33,354 [ 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-07 00:47:33,364 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:33,367 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-11-07 00:47:33,367 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-11-07 00:47:33,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:33,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-07 00:47:33,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:33,515 [ 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-07 00:47:33,527 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-07 00:47:33,528 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:33,530 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-11-07 00:47:33,530 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-11-07 00:47:33,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:33,890 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-07 00:47:33,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:33,902 [ 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-07 00:47:33,914 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-07 00:47:33,915 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:33,918 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-11-07 00:47:33,918 [ scc.git] DEBUG package.json | 2 +-
2024-11-07 00:47:33,918 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-11-07 00:47:34,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:34,280 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:34,322 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:34,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:34,328 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:34,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:34,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06e2640> has no local changes
2024-11-07 00:47:34,375 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:34,384 [ scc.git] DEBUG [detached HEAD 4e66a2c] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:34,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:34,385 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:34,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-07 00:47:35,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-07 00:47:35,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-07 00:47:36,245 [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-07 00:47:36,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-07 00:47:37,200 [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-07 00:47:37,201 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-07 00:47:37,201 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:37,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-07 00:47:37,201 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:37,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:37,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:37,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:37,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:37,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:37,224 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:37,224 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-07 00:47:37,548 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-07 00:47:37,549 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-07 00:47:37,553 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:37,553 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:37,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:37,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-07 00:47:37,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:37,572 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-07 00:47:37,582 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:37,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:37,735 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:37,778 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:37,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:37,784 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:37,826 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:37,833 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06f3b80> has no local changes
2024-11-07 00:47:37,833 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:37,841 [ scc.git] DEBUG [detached HEAD f6851ab] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:37,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:37,841 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:38,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-07 00:47:38,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-07 00:47:39,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-07 00:47:39,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-07 00:47:40,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-07 00:47:40,548 [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-07 00:47:41,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-07 00:47:41,490 [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-07 00:47:41,491 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-07 00:47:41,491 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:41,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-07 00:47:41,491 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:41,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:41,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:41,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:41,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:41,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:41,514 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:41,515 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-07 00:47:41,863 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-07 00:47:41,863 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-07 00:47:41,868 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:41,868 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:41,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:41,874 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-07 00:47:41,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:41,886 [ 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-07 00:47:41,896 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-07 00:47:41,897 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:41,899 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-07 00:47:41,899 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-07 00:47:42,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:42,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:42,097 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:42,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:42,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:42,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:42,160 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0753f40> has no local changes
2024-11-07 00:47:42,161 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:42,171 [ scc.git] DEBUG [detached HEAD 64d229f] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:42,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:42,171 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:42,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-07 00:47:43,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-07 00:47:43,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-07 00:47:44,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-07 00:47:44,482 [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-07 00:47:45,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-07 00:47:45,410 [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-07 00:47:45,411 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-07 00:47:45,411 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:45,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-07 00:47:45,411 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:45,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:45,418 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:45,423 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:45,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:45,429 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:45,435 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:45,435 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-07 00:47:45,777 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-07 00:47:45,777 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-07 00:47:45,782 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:45,782 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:45,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:45,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-07 00:47:45,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:45,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-07 00:47:45,861 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG Auto-merging setup.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-07 00:47:45,862 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:47:45,862 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:47:45,869 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-07 00:47:45,877 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-07 00:47:46,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:46,020 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-07 00:47:46,028 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-07 00:47:46,034 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-11-07 00:47:46,040 [ scc.config] DEBUG Found github.token
2024-11-07 00:47:46,041 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-07 00:47:46,041 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:46,085 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:46,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:46,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:46,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:46,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d07198b0> has no local changes
2024-11-07 00:47:46,139 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:46,148 [ scc.git] DEBUG [detached HEAD e0231eb] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:46,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:46,149 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:46,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-07 00:47:46,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-07 00:47:47,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-07 00:47:47,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-07 00:47:48,387 [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-07 00:47:48,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-07 00:47:49,295 [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-07 00:47:49,296 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-07 00:47:49,296 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:49,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-07 00:47:49,296 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:49,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:49,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:49,309 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:49,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:49,315 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:49,321 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:49,322 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-07 00:47:49,651 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-07 00:47:49,651 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-07 00:47:49,656 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:49,656 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:49,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:49,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-07 00:47:49,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:49,675 [ 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-07 00:47:49,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-07 00:47:49,703 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-07 00:47:49,704 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-07 00:47:49,704 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-07 00:47:49,704 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-07 00:47:49,704 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-07 00:47:49,707 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-07 00:47:49,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:49,851 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:49,893 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:49,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:49,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:49,939 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:49,946 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06acb80> has no local changes
2024-11-07 00:47:49,946 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:49,956 [ scc.git] DEBUG [detached HEAD 8ed4f27] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:49,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:49,956 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:50,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-07 00:47:50,257 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:50,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-07 00:47:50,257 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,263 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:50,267 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:50,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:50,273 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:50,280 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:50,281 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:50,281 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,287 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:50,327 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:50,376 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:50,384 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06a9310> has no local changes
2024-11-07 00:47:50,384 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:50,393 [ scc.git] DEBUG [detached HEAD 5e151b6] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:50,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:50,394 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:50,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-11-07 00:47:50,673 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:50,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-07 00:47:50,673 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:50,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:50,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:50,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:50,697 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:50,697 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:50,698 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,703 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:50,740 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:50,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:50,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:50,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:50,801 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0708e80> has no local changes
2024-11-07 00:47:50,801 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:50,810 [ scc.git] DEBUG [detached HEAD 5eabc08] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:50,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:50,810 [ scc.git] INFO Overriding base-branch from master to main
2024-11-07 00:47:50,810 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:51,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-07 00:47:51,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-07 00:47:52,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-07 00:47:52,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-07 00:47:53,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-07 00:47:53,599 [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-07 00:47:54,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-07 00:47:54,523 [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-07 00:47:54,524 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-07 00:47:54,524 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:54,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-07 00:47:54,524 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:54,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:54,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-07 00:47:54,537 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:54,538 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-07 00:47:54,544 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-07 00:47:54,551 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:54,551 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-07 00:47:54,879 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-07 00:47:54,879 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-07 00:47:54,884 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:54,884 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:54,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:54,890 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-07 00:47:54,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:54,902 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-07 00:47:54,931 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-07 00:47:54,931 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-07 00:47:54,931 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:47:54,932 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:47:54,938 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-07 00:47:54,945 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-07 00:47:55,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:55,075 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-07 00:47:55,096 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-07 00:47:55,104 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-07 00:47:55,110 [ scc.config] DEBUG Found github.token
2024-11-07 00:47:55,110 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-07 00:47:55,110 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:55,154 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,160 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:55,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:55,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06e9fd0> has no local changes
2024-11-07 00:47:55,210 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:55,219 [ scc.git] DEBUG [detached HEAD 6849a67] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:55,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:55,220 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:55,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-07 00:47:55,497 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:55,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-07 00:47:55,497 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,503 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:55,509 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:55,509 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:55,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:55,522 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:55,522 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:55,522 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,528 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:55,571 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:55,614 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:55,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d44a3a30> has no local changes
2024-11-07 00:47:55,620 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:55,629 [ scc.git] DEBUG [detached HEAD ff62e8b] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:55,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:55,630 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:55,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-07 00:47:55,925 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:55,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-07 00:47:55,925 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,931 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:55,936 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:55,936 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:55,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:55,946 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:55,947 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:55,947 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,951 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:55,989 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:55,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:55,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:56,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:56,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d0629640> has no local changes
2024-11-07 00:47:56,039 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:56,047 [ scc.git] DEBUG [detached HEAD 6920184] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:56,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:56,047 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:47:56,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-07 00:47:56,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-07 00:47:57,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-07 00:47:57,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-07 00:47:58,358 [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-07 00:47:58,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-07 00:47:59,241 [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-07 00:47:59,242 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-07 00:47:59,242 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:47:59,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-07 00:47:59,242 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:59,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:59,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-07 00:47:59,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:47:59,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-07 00:47:59,259 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-07 00:47:59,264 [ scc.git] DEBUG Already up to date.
2024-11-07 00:47:59,265 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-07 00:47:59,610 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-07 00:47:59,610 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-07 00:47:59,615 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:47:59,615 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:59,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:59,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-07 00:47:59,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:59,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-07 00:47:59,675 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-07 00:47:59,675 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-07 00:47:59,675 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:47:59,676 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:47:59,683 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-07 00:47:59,690 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-07 00:47:59,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:47:59,838 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-07 00:47:59,844 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-07 00:47:59,852 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-07 00:47:59,856 [ scc.config] DEBUG Found github.token
2024-11-07 00:47:59,857 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-07 00:47:59,857 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:47:59,895 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:47:59,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:47:59,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:47:59,941 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:47:59,948 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d06822e0> has no local changes
2024-11-07 00:47:59,948 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:47:59,957 [ scc.git] DEBUG [detached HEAD 33ee54d] merge master -Dorg -Ssuccess-only
2024-11-07 00:47:59,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:47:59,957 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-07 00:47:59,957 [ scc.repo] DEBUG ## PRs found:
2024-11-07 00:48:00,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-07 00:48:00,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-07 00:48:01,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-07 00:48:01,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-07 00:48:02,232 [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-07 00:48:02,696 [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-07 00:48:03,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-07 00:48:03,500 [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-07 00:48:03,500 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-07 00:48:03,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-07 00:48:04,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-07 00:48:04,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-07 00:48:05,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-07 00:48:05,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-07 00:48:06,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-07 00:48:06,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-07 00:48:07,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-07 00:48:07,583 [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-07 00:48:07,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-07 00:48:08,394 [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-07 00:48:08,395 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-07 00:48:08,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-07 00:48:09,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-07 00:48:09,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-07 00:48:10,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-07 00:48:10,359 [ scc.repo] DEBUG ## Branches found:
2024-11-07 00:48:10,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-07 00:48:10,360 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:48:10,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:48:10,367 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-07 00:48:10,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-07 00:48:10,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-07 00:48:10,378 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-07 00:48:10,384 [ scc.git] DEBUG Already up to date.
2024-11-07 00:48:10,385 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-07 00:48:10,805 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-07 00:48:10,805 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-07 00:48:10,810 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-07 00:48:11,108 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-07 00:48:11,108 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-07 00:48:11,113 [ scc.git] DEBUG ## Unique users: []
2024-11-07 00:48:11,113 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:48:11,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:48:11,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-07 00:48:11,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:48:11,133 [ 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-07 00:48:11,255 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-07 00:48:11,255 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-07 00:48:11,255 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-07 00:48:11,255 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-07 00:48:11,261 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-07 00:48:11,267 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-07 00:48:11,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:11,404 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-07 00:48:11,412 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-07 00:48:11,417 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#235](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-07 00:48:11,424 [ scc.config] DEBUG Found github.token
2024-11-07 00:48:11,424 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-07 00:48:11,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-07 00:48:11,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:48:11,439 [ 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-07 00:48:11,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-07 00:48:11,450 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-07 00:48:11,451 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-07 00:48:11,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:11,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-07 00:48:11,832 [ scc.git] DEBUG Get sha1 of %s
2024-11-07 00:48:11,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-07 00:48:11,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:48:11,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:48:11,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d067aa90> has no local changes
2024-11-07 00:48:11,885 [ 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:48:11,894 [ scc.git] DEBUG [detached HEAD 27a7ae6] merge master -Dorg -Ssuccess-only
2024-11-07 00:48:11,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:11,894 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-07 00:48:11,970 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-07 00:48:12,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:12,198 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-07 00:48:12,203 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-07 00:48:12,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:12,625 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-07 00:48:12,632 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-07 00:48:12,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:13,006 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-07 00:48:13,012 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-07 00:48:13,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:13,404 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-07 00:48:13,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:13,781 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-07 00:48:13,786 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-07 00:48:14,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:14,171 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-07 00:48:14,177 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-07 00:48:14,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:14,553 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-07 00:48:14,557 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-07 00:48:14,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:14,938 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-07 00:48:14,943 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-07 00:48:15,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:15,317 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-07 00:48:15,322 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-07 00:48:15,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:15,712 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-07 00:48:15,719 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-07 00:48:16,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:16,097 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-07 00:48:16,103 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-07 00:48:16,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:16,485 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-07 00:48:16,493 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-07 00:48:16,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:16,874 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-07 00:48:17,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:17,265 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-07 00:48:17,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:17,653 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-07 00:48:17,661 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-07 00:48:18,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:18,037 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-07 00:48:18,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:18,434 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-07 00:48:18,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:18,809 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-07 00:48:18,814 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-07 00:48:19,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:19,339 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-07 00:48:19,344 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-07 00:48:19,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:19,719 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-07 00:48:19,724 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-07 00:48:20,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:20,103 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-07 00:48:20,107 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-07 00:48:20,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-07 00:48:20,494 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-07 00:48:20,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-07 00:48:20,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd6d20cda60> has local changes
2024-11-07 00:48:20,579 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
- 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 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 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
- PR 484 barrettMCW 'improved mirroring'
Conflicting PRs (not included):
- 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 86 will-moore 'fix return of default favicon if not found'
- 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#235 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/235/)'
2024-11-07 00:48:20,593 [ scc.git] DEBUG [detached HEAD 9533b75] merge master -Dorg -Ssuccess-only
2024-11-07 00:48:20,594 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-07 00:48:20,594 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-07 00:48:20,594 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-07 00:48:20,594 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,594 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-07 00:48:20,594 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,594 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-07 00:48:20,594 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,594 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-07 00:48:20,594 [ scc.merge] INFO
2024-11-07 00:48:20,594 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-07 00:48:20,594 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-11-07 00:48:20,595 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-07 00:48:20,595 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-07 00:48:20,595 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-07 00:48:20,595 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-07 00:48:20,595 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,595 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-07 00:48:20,595 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-07 00:48:20,595 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-07 00:48:20,596 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-07 00:48:20,596 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-07 00:48:20,596 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-07 00:48:20,596 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,596 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-11-07 00:48:20,596 [ scc.merge] INFO
2024-11-07 00:48:20,596 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-07 00:48:20,597 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-07 00:48:20,597 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 90 jburel 'Update gha'
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-07 00:48:20,597 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 88 jburel 'Update gha'
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-07 00:48:20,597 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-07 00:48:20,597 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-07 00:48:20,597 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,597 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,597 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-07 00:48:20,597 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-07 00:48:20,598 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,598 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,598 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,598 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,598 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO
2024-11-07 00:48:20,598 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-07 00:48:20,598 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,598 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-07 00:48:20,598 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-07 00:48:20,599 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-07 00:48:20,599 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-07 00:48:20,599 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Repository: ome/scripts
2024-11-07 00:48:20,599 [ scc.merge] INFO Excluded PRs:
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-07 00:48:20,599 [ scc.merge] INFO Already up to date.
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Merged PRs:
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-07 00:48:20,599 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-07 00:48:20,599 [ scc.merge] INFO
2024-11-07 00:48:20,599 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-07 00:48:20,600 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-07 00:48:20,606 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-07 00:48:20,612 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-07 00:48:20,618 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-07 00:48:20,624 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-07 00:48:20,630 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-07 00:48:20,636 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-07 00:48:20,641 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-07 00:48:20,647 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-07 00:48:20,652 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-07 00:48:20,658 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-07 00:48:20,664 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-07 00:48:20,670 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-07 00:48:20,675 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-07 00:48:20,680 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-07 00:48:20,685 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-07 00:48:20,691 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-07 00:48:20,697 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-07 00:48:20,703 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-07 00:48:20,710 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-07 00:48:20,721 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-07 00:48:20,726 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-07 00:48:20,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-07 00:48:20,735 [ scc.git] DEBUG Calling 'git remote'
2024-11-07 00:48:20,741 [ 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 3ee7b01] 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 3a505e4
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 61066c1] 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-07 00:49:08,080 [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-07 00:49:16,777 [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-07 00:49:19,060 [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-07 00:49:23,429 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-07 00:50:02,233 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
