Skipping 135 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-11-03 00:43:09,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-11-03 00:43:09,117 [ scc.repo] DEBUG # ... Include label: include
2024-11-03 00:43:09,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-03 00:43:10,056 [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-03 00:43:10,473 [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-03 00:43:10,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-03 00:43:11,294 [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-03 00:43:11,295 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-11-03 00:43:11,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-11-03 00:43:11,822 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:43:12,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-03 00:43:12,842 [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-03 00:43:13,362 [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-03 00:43:13,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-03 00:43:14,326 [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-03 00:43:14,327 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-03 00:43:14,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-11-03 00:43:15,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-11-03 00:43:15,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-03 00:43:16,147 [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-03 00:43:16,629 [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-03 00:43:17,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-03 00:43:17,486 [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-03 00:43:17,487 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-03 00:43:17,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-11-03 00:43:17,953 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:43:18,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-03 00:43:19,011 [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-03 00:43:19,472 [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-03 00:43:20,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-03 00:43:20,510 [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-03 00:43:20,511 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-03 00:43:20,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-11-03 00:43:20,956 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:43:21,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-03 00:43:21,964 [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-03 00:43:22,447 [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-03 00:43:22,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-03 00:43:23,264 [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-03 00:43:23,265 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-03 00:43:23,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-03 00:43:24,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-03 00:43:24,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-03 00:43:25,063 [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-03 00:43:25,480 [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-03 00:43:25,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-03 00:43:26,387 [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-03 00:43:26,388 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-03 00:43:26,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-03 00:43:27,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-03 00:43:27,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-03 00:43:28,234 [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-03 00:43:28,678 [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-03 00:43:29,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-03 00:43:29,545 [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-03 00:43:29,545 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-03 00:43:29,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-03 00:43:30,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-03 00:43:30,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-03 00:43:31,378 [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-03 00:43:31,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-03 00:43:32,266 [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-03 00:43:32,267 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-03 00:43:32,267 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:43:32,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-03 00:43:32,268 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:32,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:32,274 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:43:32,280 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:43:32,280 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:43:32,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:43:32,310 [ scc.git] DEBUG Already up to date.
2024-11-03 00:43:32,310 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-03 00:43:32,784 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:32,785 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-03 00:43:32,790 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-03 00:43:34,029 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:34,030 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-03 00:43:34,035 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-03 00:43:34,432 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:34,432 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-03 00:43:34,437 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-11-03 00:43:34,718 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:34,718 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-11-03 00:43:34,723 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-11-03 00:43:35,014 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:35,014 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-11-03 00:43:35,020 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-11-03 00:43:35,417 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:35,417 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-11-03 00:43:35,425 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-11-03 00:43:35,706 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:35,706 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-11-03 00:43:35,710 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-11-03 00:43:36,338 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:36,338 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-11-03 00:43:36,343 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-11-03 00:43:36,753 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-03 00:43:36,753 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-11-03 00:43:36,757 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:43:36,758 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:36,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:36,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-03 00:43:36,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:36,775 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-03 00:43:36,885 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-03 00:43:36,886 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:36,890 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-03 00:43:36,890 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-03 00:43:36,890 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-03 00:43:37,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:37,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-03 00:43:37,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:37,031 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-03 00:43:37,158 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-03 00:43:37,158 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-03 00:43:37,158 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-03 00:43:37,158 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-03 00:43:37,159 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:37,163 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-03 00:43:37,163 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-03 00:43:37,163 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-03 00:43:37,163 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-03 00:43:37,163 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-03 00:43:37,163 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-03 00:43:37,163 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-03 00:43:37,163 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-03 00:43:37,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:37,402 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-03 00:43:37,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:37,417 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-03 00:43:37,483 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-03 00:43:37,484 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:37,487 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-03 00:43:37,487 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-03 00:43:37,487 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-03 00:43:37,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:37,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-03 00:43:37,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:37,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-03 00:43:37,903 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:37,913 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-11-03 00:43:37,913 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-11-03 00:43:38,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:38,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-03 00:43:38,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:38,189 [ 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-03 00:43:38,237 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-03 00:43:38,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:38,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:38,558 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-03 00:43:38,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:38,574 [ 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-03 00:43:38,735 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-03 00:43:38,735 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-03 00:43:38,735 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-03 00:43:38,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-11-03 00:43:38,740 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-11-03 00:43:38,740 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-11-03 00:43:38,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:38,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-03 00:43:38,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:38,968 [ 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-03 00:43:39,079 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-03 00:43:39,084 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:39,095 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-11-03 00:43:39,095 [ scc.git] DEBUG package.json | 2 +-
2024-11-03 00:43:39,095 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-11-03 00:43:39,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:39,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-03 00:43:39,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:39,346 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-03 00:43:39,376 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:39,379 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-11-03 00:43:39,379 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-11-03 00:43:39,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:39,710 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-11-03 00:43:39,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:39,727 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-03 00:43:39,889 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-11-03 00:43:39,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-11-03 00:43:39,889 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:43:39,890 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:43:39,899 [ scc.git] DEBUG Calling 'git reset --hard 440c2ecbcf93879694ea67142d0eb3e513d9c4be'
2024-11-03 00:43:39,913 [ scc.git] DEBUG HEAD is now at 440c2ec merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-11-03 00:43:40,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:40,088 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-03 00:43:40,096 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-11-03 00:43:40,102 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/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-03 00:43:40,108 [ scc.config] DEBUG Found github.token
2024-11-03 00:43:40,108 [ scc.git] DEBUG Adding comment to issue #488.
2024-11-03 00:43:40,896 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-11-03 00:43:40,897 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:43:40,938 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:40,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:40,944 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:43:40,988 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:43:40,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40053f0ee0> has no local changes
2024-11-03 00:43:40,999 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:43:41,020 [ scc.git] DEBUG [detached HEAD 6e9d05c] merge master -Dorg -Ssuccess-only
2024-11-03 00:43:41,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:43:41,020 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:43:41,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-03 00:43:41,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/90 HTTP/1.1" 200 None
2024-11-03 00:43:42,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-03 00:43:42,808 [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-03 00:43:43,286 [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-03 00:43:43,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-03 00:43:44,175 [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-03 00:43:44,176 [ scc.repo] DEBUG - PR 90 jburel 'Update gha'
2024-11-03 00:43:44,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-11-03 00:43:45,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-11-03 00:43:45,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-03 00:43:46,039 [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-03 00:43:46,511 [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-03 00:43:47,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-03 00:43:47,404 [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-03 00:43:47,404 [ scc.repo] DEBUG - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-03 00:43:47,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-03 00:43:48,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-03 00:43:48,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-03 00:43:49,299 [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-03 00:43:49,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-03 00:43:50,120 [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-03 00:43:50,121 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-03 00:43:50,121 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:43:50,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-03 00:43:50,121 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:50,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:50,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:43:50,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:43:50,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:43:50,141 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:43:50,148 [ scc.git] DEBUG Already up to date.
2024-11-03 00:43:50,148 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-03 00:43:50,477 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-03 00:43:50,477 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-03 00:43:50,482 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-11-03 00:43:50,816 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-03 00:43:50,817 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-11-03 00:43:50,822 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-11-03 00:43:51,099 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-03 00:43:51,100 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-11-03 00:43:51,105 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:43:51,105 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:51,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:51,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-03 00:43:51,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:51,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-03 00:43:51,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:51,173 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-03 00:43:51,173 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-03 00:43:51,173 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-03 00:43:51,173 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-03 00:43:51,173 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-03 00:43:51,173 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-03 00:43:51,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:51,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8281624292868ccde51de5ce6c40b155b8b36893'
2024-11-03 00:43:51,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:51,321 [ 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-03 00:43:51,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:51,348 [ scc.git] DEBUG omero_mapr/views.py | 5 +++--
2024-11-03 00:43:51,348 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-03 00:43:51,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:51,709 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-03 00:43:51,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:51,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Update gha) ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-03 00:43:51,739 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:43:51,744 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-03 00:43:51,744 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-03 00:43:51,744 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-03 00:43:52,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:43:52,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:43:52,146 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:43:52,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:43:52,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:43:52,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:43:52,199 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40043a7370> has no local changes
2024-11-03 00:43:52,199 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:43:52,208 [ scc.git] DEBUG [detached HEAD 2b44caa] merge master -Dorg -Ssuccess-only
2024-11-03 00:43:52,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:43:52,208 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:43:52,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-03 00:43:53,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/88 HTTP/1.1" 200 None
2024-11-03 00:43:53,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-03 00:43:54,044 [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-03 00:43:54,480 [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-03 00:43:54,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-03 00:43:55,374 [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-03 00:43:55,375 [ scc.repo] DEBUG - PR 88 jburel 'Update gha'
2024-11-03 00:43:55,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-03 00:43:56,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-03 00:43:56,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-03 00:43:57,185 [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-03 00:43:57,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-03 00:43:58,130 [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-03 00:43:58,131 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-03 00:43:58,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-03 00:43:58,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-03 00:43:59,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-03 00:43:59,915 [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-03 00:44:00,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-03 00:44:00,809 [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-03 00:44:00,810 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-03 00:44:00,810 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:00,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-03 00:44:00,810 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:00,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:00,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:00,821 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:00,822 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:00,827 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:00,832 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:00,832 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-03 00:44:01,386 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-03 00:44:01,386 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-03 00:44:01,391 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-03 00:44:01,906 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-03 00:44:01,906 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-03 00:44:01,911 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-11-03 00:44:02,345 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-03 00:44:02,345 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-11-03 00:44:02,350 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:02,350 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:02,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:02,356 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-03 00:44:02,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:02,367 [ 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-03 00:44:02,455 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-03 00:44:02,455 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-03 00:44:02,455 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-03 00:44:02,455 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-03 00:44:02,455 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:02,456 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:02,463 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-03 00:44:02,471 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-03 00:44:02,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:02,610 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-03 00:44:02,619 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-03 00:44:02,657 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-11-03 00:44:02,663 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:02,663 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-03 00:44:02,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-03 00:44:02,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:02,676 [ 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-03 00:44:02,766 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-03 00:44:02,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-03 00:44:02,766 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-03 00:44:02,766 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:02,766 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:02,773 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-03 00:44:02,780 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-03 00:44:02,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:02,994 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-03 00:44:03,002 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-03 00:44:03,008 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/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-03 00:44:03,013 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:03,013 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-03 00:44:03,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-03 00:44:03,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:03,025 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Update gha) 295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-03 00:44:03,056 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:03,059 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-03 00:44:03,059 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-03 00:44:03,059 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-03 00:44:03,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:03,380 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:03,421 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:03,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:03,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:03,478 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:03,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40043d1ee0> has no local changes
2024-11-03 00:44:03,485 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:03,494 [ scc.git] DEBUG [detached HEAD 9a03beb] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:03,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:03,495 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:03,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-03 00:44:04,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-11-03 00:44:04,384 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:44:04,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-03 00:44:05,435 [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-03 00:44:05,873 [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-03 00:44:06,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-03 00:44:06,801 [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-03 00:44:06,802 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-03 00:44:07,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-11-03 00:44:07,235 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:44:07,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-03 00:44:08,282 [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-03 00:44:08,732 [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-03 00:44:09,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-03 00:44:09,630 [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-03 00:44:09,630 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-03 00:44:10,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-11-03 00:44:10,081 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-03 00:44:10,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-03 00:44:11,134 [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-03 00:44:11,622 [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-03 00:44:12,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-03 00:44:12,517 [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-03 00:44:12,518 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-03 00:44:12,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-03 00:44:13,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-03 00:44:13,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-03 00:44:14,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-03 00:44:14,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-03 00:44:15,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-03 00:44:15,369 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:15,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-03 00:44:15,369 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:15,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:15,376 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:15,382 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:15,383 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:15,389 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:15,396 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:15,396 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-11-03 00:44:15,715 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-03 00:44:15,715 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-11-03 00:44:15,719 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-11-03 00:44:16,002 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-03 00:44:16,002 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-11-03 00:44:16,007 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-11-03 00:44:16,296 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-03 00:44:16,296 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-11-03 00:44:16,301 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:16,301 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:16,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:16,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-03 00:44:16,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:16,318 [ 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-03 00:44:16,328 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:16,330 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-11-03 00:44:16,330 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-11-03 00:44:16,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:16,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-03 00:44:16,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:16,483 [ 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-03 00:44:16,495 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-03 00:44:16,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:16,498 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-11-03 00:44:16,498 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-11-03 00:44:16,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:16,847 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-03 00:44:16,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:16,859 [ 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-03 00:44:16,887 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-03 00:44:16,888 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:16,892 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-11-03 00:44:16,892 [ scc.git] DEBUG package.json | 2 +-
2024-11-03 00:44:16,892 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-11-03 00:44:17,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:17,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:17,278 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:17,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:17,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:17,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:17,329 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40043d8be0> has no local changes
2024-11-03 00:44:17,329 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:17,359 [ scc.git] DEBUG [detached HEAD b610dd9] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:17,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:17,360 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:17,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-03 00:44:18,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-03 00:44:18,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-03 00:44:19,092 [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-03 00:44:19,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-03 00:44:19,895 [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-03 00:44:19,896 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-03 00:44:19,896 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:19,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-03 00:44:19,896 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:19,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:19,902 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:19,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:19,908 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:19,912 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:19,917 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:19,918 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-03 00:44:20,220 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-03 00:44:20,221 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-03 00:44:20,225 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:20,225 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:20,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:20,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-03 00:44:20,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:20,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-03 00:44:20,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:20,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:20,376 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:20,415 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:20,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:20,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:20,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:20,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4004395fa0> has no local changes
2024-11-03 00:44:20,467 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:20,475 [ scc.git] DEBUG [detached HEAD 50e996a] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:20,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:20,475 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:20,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-03 00:44:21,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-03 00:44:21,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-03 00:44:22,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-03 00:44:22,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-03 00:44:23,141 [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-03 00:44:23,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-03 00:44:24,054 [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-03 00:44:24,055 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-03 00:44:24,055 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:24,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-03 00:44:24,055 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:24,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:24,063 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:24,068 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:24,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:24,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:24,078 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:24,078 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-03 00:44:24,496 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-03 00:44:24,496 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-03 00:44:24,500 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:24,500 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:24,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:24,507 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-03 00:44:24,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:24,519 [ 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-03 00:44:24,529 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-03 00:44:24,529 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:24,532 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-03 00:44:24,532 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-03 00:44:24,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:24,663 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:24,704 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:24,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:24,710 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:24,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:24,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4004388df0> has no local changes
2024-11-03 00:44:24,762 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:24,771 [ scc.git] DEBUG [detached HEAD 75d716b] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:24,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:24,772 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:25,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-03 00:44:25,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-03 00:44:26,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-03 00:44:26,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-03 00:44:27,052 [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-03 00:44:27,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-03 00:44:27,979 [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-03 00:44:27,980 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-03 00:44:27,980 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:27,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-03 00:44:27,980 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:27,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:27,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:27,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:27,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:27,996 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:28,003 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:28,003 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-03 00:44:28,318 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-03 00:44:28,318 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-03 00:44:28,324 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:28,324 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:28,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:28,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-03 00:44:28,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:28,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-03 00:44:28,377 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-03 00:44:28,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-03 00:44:28,377 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-03 00:44:28,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-03 00:44:28,377 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-03 00:44:28,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-03 00:44:28,378 [ scc.git] DEBUG Auto-merging setup.py
2024-11-03 00:44:28,378 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-03 00:44:28,378 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:28,378 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:28,384 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-03 00:44:28,390 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-03 00:44:28,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:28,534 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-03 00:44:28,547 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-03 00:44:28,554 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-11-03 00:44:28,559 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:28,559 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-03 00:44:28,559 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:28,596 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:28,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:28,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:28,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:28,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4004365fd0> has no local changes
2024-11-03 00:44:28,644 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:28,651 [ scc.git] DEBUG [detached HEAD 282ed46] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:28,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:28,652 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:29,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-03 00:44:29,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-03 00:44:29,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-03 00:44:30,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-03 00:44:30,816 [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-03 00:44:31,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-03 00:44:31,620 [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-03 00:44:31,621 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-03 00:44:31,621 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:31,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-03 00:44:31,621 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:31,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:31,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:31,641 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:31,642 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:31,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:31,669 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:31,670 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-03 00:44:32,109 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-03 00:44:32,110 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-03 00:44:32,115 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:32,115 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:32,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,123 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-03 00:44:32,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,138 [ 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-03 00:44:32,186 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:32,190 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-03 00:44:32,191 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-03 00:44:32,193 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-03 00:44:32,194 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-03 00:44:32,194 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-03 00:44:32,194 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-03 00:44:32,195 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-03 00:44:32,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:32,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:32,381 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:32,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:32,440 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:32,448 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40043955b0> has no local changes
2024-11-03 00:44:32,449 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:32,461 [ scc.git] DEBUG [detached HEAD 0045d32] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:32,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:32,462 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:32,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-03 00:44:32,756 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:32,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-03 00:44:32,757 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:32,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,763 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:32,771 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:32,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:32,779 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:32,786 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:32,786 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:32,786 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:32,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,792 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:32,839 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:32,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:32,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:32,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:32,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f400434f2e0> has no local changes
2024-11-03 00:44:32,897 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:32,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:32,908 [ scc.git] DEBUG [detached HEAD 154a2b3] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:32,908 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:33,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-11-03 00:44:33,157 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:33,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-03 00:44:33,157 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:33,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:33,164 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:33,170 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:33,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:33,176 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:33,182 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:33,183 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:33,183 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:33,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:33,188 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:33,235 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:33,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:33,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:33,298 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:33,305 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40042fa9d0> has no local changes
2024-11-03 00:44:33,306 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:33,316 [ scc.git] DEBUG [detached HEAD e7f912d] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:33,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:33,317 [ scc.git] INFO Overriding base-branch from master to main
2024-11-03 00:44:33,317 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:33,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-03 00:44:34,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-03 00:44:34,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-03 00:44:34,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-03 00:44:35,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-03 00:44:35,930 [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-03 00:44:36,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-03 00:44:36,845 [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-03 00:44:36,845 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-03 00:44:36,846 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:36,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-03 00:44:36,846 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:36,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:36,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-03 00:44:36,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:36,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-03 00:44:36,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-03 00:44:36,872 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:36,872 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-03 00:44:37,284 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-03 00:44:37,284 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-03 00:44:37,289 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:37,289 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:37,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-03 00:44:37,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,308 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-03 00:44:37,328 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-03 00:44:37,329 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-03 00:44:37,329 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:37,329 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:37,336 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-03 00:44:37,344 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-03 00:44:37,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:37,521 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-03 00:44:37,528 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-03 00:44:37,535 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-03 00:44:37,540 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:37,541 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-03 00:44:37,541 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:37,586 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:37,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,593 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:37,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:37,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f400431de20> has no local changes
2024-11-03 00:44:37,645 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:37,655 [ scc.git] DEBUG [detached HEAD 9caeacd] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:37,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:37,655 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:37,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-03 00:44:37,916 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:37,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-03 00:44:37,916 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:37,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:37,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:37,930 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:37,936 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:37,942 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:37,943 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:37,943 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:37,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,948 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:37,991 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:37,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:37,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:38,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:38,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40042fa880> has no local changes
2024-11-03 00:44:38,051 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:38,063 [ scc.git] DEBUG [detached HEAD 9a7cb9e] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:38,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:38,064 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:38,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-03 00:44:38,335 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:38,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-03 00:44:38,335 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:38,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:38,341 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:38,347 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:38,347 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:38,354 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:38,361 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:38,361 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:38,361 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:38,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:38,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:38,410 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:38,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:38,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:38,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:38,462 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40042eba00> has no local changes
2024-11-03 00:44:38,462 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:38,477 [ scc.git] DEBUG [detached HEAD 41f69c5] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:38,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:38,478 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:38,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-03 00:44:39,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-03 00:44:39,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-03 00:44:40,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-03 00:44:40,619 [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-03 00:44:41,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-03 00:44:41,549 [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-03 00:44:41,550 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-03 00:44:41,550 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:41,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-03 00:44:41,550 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:41,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:41,556 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-03 00:44:41,563 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:41,563 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-03 00:44:41,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-03 00:44:41,576 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:41,576 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-03 00:44:41,953 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-03 00:44:41,953 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-03 00:44:41,958 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:41,958 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:41,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:41,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-03 00:44:41,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:41,978 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-03 00:44:41,991 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-03 00:44:41,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-03 00:44:41,992 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:41,992 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:42,001 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-03 00:44:42,010 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-03 00:44:42,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:42,140 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-03 00:44:42,146 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-03 00:44:42,152 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-03 00:44:42,158 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:42,158 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-03 00:44:42,158 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:42,199 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:42,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:42,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:42,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:42,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40042e0fd0> has no local changes
2024-11-03 00:44:42,251 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:42,260 [ scc.git] DEBUG [detached HEAD bb6df95] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:42,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:42,261 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-03 00:44:42,261 [ scc.repo] DEBUG ## PRs found:
2024-11-03 00:44:42,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-03 00:44:43,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-03 00:44:43,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-03 00:44:43,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-03 00:44:44,391 [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-03 00:44:44,819 [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-03 00:44:45,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-03 00:44:45,637 [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-03 00:44:45,638 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-03 00:44:46,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-03 00:44:46,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-03 00:44:47,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-03 00:44:47,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-03 00:44:47,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-03 00:44:48,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-03 00:44:48,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-03 00:44:49,285 [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-03 00:44:49,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-03 00:44:50,168 [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-03 00:44:50,169 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-03 00:44:50,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-03 00:44:51,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-03 00:44:51,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-03 00:44:52,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-03 00:44:52,020 [ scc.repo] DEBUG ## Branches found:
2024-11-03 00:44:52,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-03 00:44:52,020 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:52,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:52,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-03 00:44:52,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-03 00:44:52,031 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-03 00:44:52,037 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-03 00:44:52,043 [ scc.git] DEBUG Already up to date.
2024-11-03 00:44:52,043 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-03 00:44:52,352 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-03 00:44:52,353 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-03 00:44:52,357 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-03 00:44:52,702 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-03 00:44:52,702 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-03 00:44:52,707 [ scc.git] DEBUG ## Unique users: []
2024-11-03 00:44:52,707 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:52,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:52,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-03 00:44:52,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:52,729 [ 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-03 00:44:52,828 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-03 00:44:52,828 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-03 00:44:52,828 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-03 00:44:52,829 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-03 00:44:52,835 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-03 00:44:52,842 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-03 00:44:52,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:52,964 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-03 00:44:52,972 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-03 00:44:52,979 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#231](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-03 00:44:52,984 [ scc.config] DEBUG Found github.token
2024-11-03 00:44:52,985 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-03 00:44:52,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-03 00:44:52,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:53,000 [ 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-03 00:44:53,012 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-03 00:44:53,014 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-03 00:44:53,014 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-03 00:44:53,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:53,361 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-03 00:44:53,402 [ scc.git] DEBUG Get sha1 of %s
2024-11-03 00:44:53,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-03 00:44:53,409 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:53,449 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:44:53,457 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f400425a520> has no local changes
2024-11-03 00:44:53,457 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:44:53,478 [ scc.git] DEBUG [detached HEAD df4f32d] merge master -Dorg -Ssuccess-only
2024-11-03 00:44:53,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:44:53,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-03 00:44:53,558 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-03 00:44:53,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:53,757 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-03 00:44:53,762 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-03 00:44:54,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:54,159 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-03 00:44:54,165 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-03 00:44:54,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:54,551 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-03 00:44:54,556 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-03 00:44:54,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:54,935 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-03 00:44:55,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:55,311 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-03 00:44:55,317 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-03 00:44:55,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:55,694 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-03 00:44:55,699 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-03 00:44:56,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:56,075 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-03 00:44:56,080 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-03 00:44:56,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:56,456 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-03 00:44:56,461 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-03 00:44:56,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:56,841 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-03 00:44:56,846 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-03 00:44:57,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:57,229 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-03 00:44:57,234 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-03 00:44:57,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:57,616 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-03 00:44:57,621 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-03 00:44:57,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:57,993 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-03 00:44:57,998 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-03 00:44:58,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:58,381 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-03 00:44:58,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:58,761 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-03 00:44:59,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:59,130 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-03 00:44:59,135 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-03 00:44:59,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:59,537 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-03 00:44:59,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:44:59,919 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-03 00:45:00,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:45:00,291 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-03 00:45:00,297 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-03 00:45:00,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:45:00,675 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-03 00:45:00,680 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-03 00:45:01,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:45:01,055 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-03 00:45:01,060 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-03 00:45:01,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:45:01,435 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-03 00:45:01,440 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-03 00:45:01,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-03 00:45:01,820 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-03 00:45:01,820 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-03 00:45:01,903 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f40064e4730> has local changes
2024-11-03 00:45:01,903 [ 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#231 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/231/)'
2024-11-03 00:45:01,918 [ scc.git] DEBUG [detached HEAD 63754d3] merge master -Dorg -Ssuccess-only
2024-11-03 00:45:01,919 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-03 00:45:01,919 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-03 00:45:01,919 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,919 [ scc.merge] INFO
2024-11-03 00:45:01,919 [ scc.merge] INFO
2024-11-03 00:45:01,919 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-03 00:45:01,919 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,919 [ scc.merge] INFO
2024-11-03 00:45:01,919 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,919 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-11-03 00:45:01,919 [ scc.merge] INFO
2024-11-03 00:45:01,919 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-03 00:45:01,919 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-03 00:45:01,920 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-03 00:45:01,920 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-11-03 00:45:01,920 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-03 00:45:01,920 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-03 00:45:01,920 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,920 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-03 00:45:01,920 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-11-03 00:45:01,920 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-03 00:45:01,920 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,920 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-03 00:45:01,921 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-03 00:45:01,921 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-03 00:45:01,921 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,921 [ 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-03 00:45:01,921 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-03 00:45:01,921 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,921 [ scc.merge] INFO
2024-11-03 00:45:01,921 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-03 00:45:01,921 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-03 00:45:01,922 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-03 00:45:01,922 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 90 jburel 'Update gha'
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-03 00:45:01,922 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 88 jburel 'Update gha'
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-03 00:45:01,922 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-03 00:45:01,922 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,922 [ scc.merge] INFO
2024-11-03 00:45:01,922 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-03 00:45:01,922 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-03 00:45:01,923 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,923 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-03 00:45:01,923 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,923 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-03 00:45:01,924 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-03 00:45:01,924 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-03 00:45:01,924 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-03 00:45:01,924 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-03 00:45:01,924 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Repository: ome/scripts
2024-11-03 00:45:01,924 [ scc.merge] INFO Excluded PRs:
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-03 00:45:01,924 [ scc.merge] INFO Already up to date.
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Merged PRs:
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,924 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-03 00:45:01,924 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-03 00:45:01,924 [ scc.merge] INFO
2024-11-03 00:45:01,925 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-03 00:45:01,925 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-03 00:45:01,930 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-03 00:45:01,937 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-03 00:45:01,943 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-03 00:45:01,948 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-03 00:45:01,954 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-03 00:45:01,960 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-03 00:45:01,966 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-03 00:45:01,971 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-03 00:45:01,977 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-03 00:45:01,982 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-03 00:45:01,988 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-03 00:45:01,994 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:01,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:01,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-03 00:45:01,999 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-03 00:45:02,005 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-03 00:45:02,011 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-03 00:45:02,017 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-03 00:45:02,022 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-03 00:45:02,027 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-03 00:45:02,033 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-03 00:45:02,039 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-03 00:45:02,046 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-03 00:45:02,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-03 00:45:02,052 [ scc.git] DEBUG Calling 'git remote'
2024-11-03 00:45:02,057 [ 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 d2fa4d3] 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 af59c5b] 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-03 00:45:46,226 [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-03 00:45:54,885 [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-03 00:45:57,120 [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-03 00:46:01,393 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-03 00:46:39,777 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
