Skipping 135 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-11-04 00:42:14,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-11-04 00:42:14,253 [ scc.repo] DEBUG # ... Include label: include
2024-11-04 00:42:14,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-04 00:42:15,229 [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-04 00:42:15,704 [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-04 00:42:16,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-04 00:42:16,526 [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-04 00:42:16,526 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-11-04 00:42:16,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-11-04 00:42:16,972 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:42:17,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-04 00:42:17,998 [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-04 00:42:18,461 [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-04 00:42:19,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-04 00:42:19,495 [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-04 00:42:19,495 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-04 00:42:19,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-11-04 00:42:20,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-11-04 00:42:20,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-04 00:42:21,376 [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-04 00:42:21,807 [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-04 00:42:22,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-04 00:42:22,691 [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-04 00:42:22,691 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-04 00:42:23,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-11-04 00:42:23,131 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:42:23,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-04 00:42:24,277 [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-04 00:42:24,772 [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-04 00:42:25,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-04 00:42:25,812 [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-04 00:42:25,813 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-04 00:42:26,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-11-04 00:42:26,241 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:42:26,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-04 00:42:27,309 [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-04 00:42:27,826 [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-04 00:42:28,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-04 00:42:28,785 [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-04 00:42:28,785 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-04 00:42:29,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-04 00:42:29,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-04 00:42:30,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-04 00:42:30,658 [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-04 00:42:31,131 [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-04 00:42:31,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-04 00:42:32,023 [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-04 00:42:32,024 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-04 00:42:32,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-04 00:42:32,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-04 00:42:33,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-04 00:42:33,937 [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-04 00:42:34,381 [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-04 00:42:34,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-04 00:42:35,204 [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-04 00:42:35,205 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-04 00:42:35,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-04 00:42:36,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-04 00:42:36,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-04 00:42:37,020 [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-04 00:42:37,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-04 00:42:37,932 [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-04 00:42:37,932 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-04 00:42:37,933 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:42:37,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-04 00:42:37,934 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:37,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:37,940 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:42:37,945 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:42:37,945 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:42:37,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:42:37,967 [ scc.git] DEBUG Already up to date.
2024-11-04 00:42:37,968 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-04 00:42:38,284 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:38,284 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-04 00:42:38,289 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-04 00:42:39,570 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:39,571 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-04 00:42:39,576 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-04 00:42:39,856 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:39,857 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-04 00:42:39,861 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-11-04 00:42:40,141 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:40,141 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-11-04 00:42:40,146 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-11-04 00:42:40,430 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:40,430 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-11-04 00:42:40,435 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-11-04 00:42:40,714 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:40,714 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-11-04 00:42:40,719 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-11-04 00:42:41,009 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:41,009 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-11-04 00:42:41,014 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-11-04 00:42:41,325 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:41,325 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-11-04 00:42:41,331 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-11-04 00:42:41,616 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-04 00:42:41,617 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-11-04 00:42:41,621 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:42:41,621 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:41,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:41,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-04 00:42:41,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:41,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-04 00:42:41,650 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-04 00:42:41,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:41,654 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-04 00:42:41,654 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-04 00:42:41,654 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-04 00:42:41,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:41,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-04 00:42:41,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:41,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-04 00:42:41,865 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-04 00:42:41,865 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-04 00:42:41,865 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-04 00:42:41,865 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-04 00:42:41,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:41,870 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-04 00:42:41,870 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-04 00:42:41,870 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-04 00:42:41,870 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-04 00:42:41,870 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-04 00:42:41,870 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-04 00:42:41,870 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-04 00:42:41,870 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-04 00:42:42,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:42,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-04 00:42:42,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:42,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-04 00:42:42,221 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-04 00:42:42,222 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:42,225 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-04 00:42:42,225 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-04 00:42:42,225 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-04 00:42:42,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:42,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-04 00:42:42,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:42,594 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-04 00:42:42,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:42,728 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-11-04 00:42:42,728 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-11-04 00:42:42,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:42,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-04 00:42:42,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:42,982 [ 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-04 00:42:43,015 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-04 00:42:43,016 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:43,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:43,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-04 00:42:43,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:43,372 [ 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-04 00:42:43,386 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-04 00:42:43,387 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-04 00:42:43,387 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-04 00:42:43,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-11-04 00:42:43,445 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-11-04 00:42:43,445 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-11-04 00:42:43,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:43,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-04 00:42:43,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:43,756 [ 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-04 00:42:43,808 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-04 00:42:43,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:43,819 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-11-04 00:42:43,819 [ scc.git] DEBUG package.json | 2 +-
2024-11-04 00:42:43,819 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-11-04 00:42:44,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:44,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-04 00:42:44,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:44,140 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-04 00:42:44,154 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:44,156 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-11-04 00:42:44,157 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-11-04 00:42:44,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:44,507 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-11-04 00:42:44,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:44,520 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-04 00:42:44,679 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-11-04 00:42:44,680 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-11-04 00:42:44,680 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:42:44,680 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:42:44,687 [ scc.git] DEBUG Calling 'git reset --hard 96a4e0fb80f62d065dfb121ce5555e5771cfd4f6'
2024-11-04 00:42:44,695 [ scc.git] DEBUG HEAD is now at 96a4e0f merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-11-04 00:42:44,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:44,884 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-04 00:42:44,890 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-11-04 00:42:44,896 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/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-04 00:42:44,900 [ scc.config] DEBUG Found github.token
2024-11-04 00:42:44,901 [ scc.git] DEBUG Adding comment to issue #488.
2024-11-04 00:42:45,680 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-11-04 00:42:45,682 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:42:45,720 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:45,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:45,726 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:42:45,762 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:42:45,769 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8400525b20> has no local changes
2024-11-04 00:42:45,769 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:42:45,793 [ scc.git] DEBUG [detached HEAD 0df13fb] merge master -Dorg -Ssuccess-only
2024-11-04 00:42:45,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:42:45,793 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:42:46,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-04 00:42:46,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/90 HTTP/1.1" 200 None
2024-11-04 00:42:47,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-04 00:42:47,613 [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-04 00:42:48,027 [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-04 00:42:48,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-04 00:42:48,912 [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-04 00:42:48,913 [ scc.repo] DEBUG - PR 90 jburel 'Update gha'
2024-11-04 00:42:49,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-11-04 00:42:49,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-11-04 00:42:50,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-04 00:42:50,808 [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-04 00:42:51,255 [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-04 00:42:51,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/8281624292868ccde51de5ce6c40b155b8b36893 HTTP/1.1" 200 None
2024-11-04 00:42:52,150 [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-04 00:42:52,151 [ scc.repo] DEBUG - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-04 00:42:52,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-04 00:42:53,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-04 00:42:53,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-04 00:42:54,035 [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-04 00:42:54,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-04 00:42:54,860 [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-04 00:42:54,860 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-04 00:42:54,860 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:42:54,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-04 00:42:54,861 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:54,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:54,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:42:54,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:42:54,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:42:54,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:42:54,883 [ scc.git] DEBUG Already up to date.
2024-11-04 00:42:54,883 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-04 00:42:55,175 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-04 00:42:55,176 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-04 00:42:55,180 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-11-04 00:42:55,516 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-04 00:42:55,517 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-11-04 00:42:55,523 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-11-04 00:42:56,007 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-04 00:42:56,008 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-11-04 00:42:56,012 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:42:56,012 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:56,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:56,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-04 00:42:56,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:56,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-04 00:42:56,133 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:56,136 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-04 00:42:56,136 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-04 00:42:56,136 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-04 00:42:56,137 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-04 00:42:56,137 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-04 00:42:56,137 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-04 00:42:56,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:56,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8281624292868ccde51de5ce6c40b155b8b36893'
2024-11-04 00:42:56,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:56,292 [ 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-04 00:42:56,319 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:56,322 [ scc.git] DEBUG omero_mapr/views.py | 5 +++--
2024-11-04 00:42:56,322 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-11-04 00:42:56,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:56,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-04 00:42:56,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:56,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Update gha) ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-04 00:42:56,678 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:42:56,681 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-04 00:42:56,681 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-04 00:42:56,681 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-04 00:42:57,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:42:57,137 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:42:57,177 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:42:57,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:42:57,183 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:42:57,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:42:57,229 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004df370> has no local changes
2024-11-04 00:42:57,230 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:42:57,239 [ scc.git] DEBUG [detached HEAD b3863fc] merge master -Dorg -Ssuccess-only
2024-11-04 00:42:57,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:42:57,239 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:42:57,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-04 00:42:58,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/88 HTTP/1.1" 200 None
2024-11-04 00:42:58,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-04 00:42:59,084 [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-04 00:42:59,507 [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-04 00:43:00,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-04 00:43:00,435 [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-04 00:43:00,436 [ scc.repo] DEBUG - PR 88 jburel 'Update gha'
2024-11-04 00:43:00,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-04 00:43:01,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-04 00:43:01,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-04 00:43:02,325 [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-04 00:43:02,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-04 00:43:03,273 [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-04 00:43:03,273 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-04 00:43:03,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-04 00:43:04,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-04 00:43:04,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-04 00:43:05,138 [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-04 00:43:05,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-04 00:43:06,028 [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-04 00:43:06,029 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-04 00:43:06,029 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:06,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-04 00:43:06,030 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:06,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:06,035 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:06,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:06,040 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:06,045 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:06,050 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:06,050 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-04 00:43:06,382 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-04 00:43:06,382 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-04 00:43:06,387 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-04 00:43:06,681 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-04 00:43:06,682 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-04 00:43:06,687 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-11-04 00:43:07,354 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-04 00:43:07,354 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-11-04 00:43:07,359 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:07,359 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:07,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:07,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-04 00:43:07,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:07,379 [ 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-04 00:43:07,518 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-04 00:43:07,518 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-04 00:43:07,518 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-04 00:43:07,518 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-04 00:43:07,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:07,518 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:07,525 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-04 00:43:07,531 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-04 00:43:07,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:07,670 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-04 00:43:07,678 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-04 00:43:07,719 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-11-04 00:43:07,724 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:07,725 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-04 00:43:07,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-04 00:43:07,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:07,737 [ 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-04 00:43:07,753 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-04 00:43:07,754 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-04 00:43:07,754 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-04 00:43:07,754 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:07,754 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:07,760 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-04 00:43:07,767 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-04 00:43:08,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:08,046 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-04 00:43:08,053 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-04 00:43:08,058 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/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-04 00:43:08,062 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:08,063 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-04 00:43:08,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-04 00:43:08,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:08,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Update gha) 295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-04 00:43:08,147 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:08,149 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-04 00:43:08,149 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-04 00:43:08,149 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-04 00:43:08,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:08,452 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:08,492 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:08,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:08,498 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:08,534 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:08,540 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004dbee0> has no local changes
2024-11-04 00:43:08,540 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:08,548 [ scc.git] DEBUG [detached HEAD 709624d] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:08,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:08,548 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:08,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-04 00:43:09,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-11-04 00:43:09,459 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:43:10,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-04 00:43:10,524 [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-04 00:43:11,008 [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-04 00:43:11,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-04 00:43:11,839 [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-04 00:43:11,839 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-04 00:43:12,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-11-04 00:43:12,282 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:43:12,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-04 00:43:13,348 [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-04 00:43:13,807 [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-04 00:43:14,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-04 00:43:14,780 [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-04 00:43:14,781 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-04 00:43:15,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-11-04 00:43:15,227 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-04 00:43:15,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-04 00:43:16,225 [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-04 00:43:16,705 [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-04 00:43:17,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-04 00:43:17,565 [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-04 00:43:17,566 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-04 00:43:18,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-04 00:43:18,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-04 00:43:18,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-04 00:43:19,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-04 00:43:19,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-04 00:43:20,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-04 00:43:20,314 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:20,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-04 00:43:20,314 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:20,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:20,321 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:20,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:20,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:20,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:20,339 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:20,339 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-11-04 00:43:20,638 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-04 00:43:20,638 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-11-04 00:43:20,643 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-11-04 00:43:20,941 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-04 00:43:20,942 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-11-04 00:43:20,946 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-11-04 00:43:21,251 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-04 00:43:21,251 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-11-04 00:43:21,256 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:21,256 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:21,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:21,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-04 00:43:21,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:21,272 [ 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-04 00:43:21,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:21,479 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-11-04 00:43:21,479 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-11-04 00:43:21,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:21,614 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-04 00:43:21,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:21,626 [ 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-04 00:43:21,636 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-04 00:43:21,636 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:21,639 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-11-04 00:43:21,639 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-11-04 00:43:22,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:22,121 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-04 00:43:22,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:22,133 [ 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-04 00:43:22,143 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-04 00:43:22,144 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:22,147 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-11-04 00:43:22,147 [ scc.git] DEBUG package.json | 2 +-
2024-11-04 00:43:22,147 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-11-04 00:43:22,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:22,504 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:22,544 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:22,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:22,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:22,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:22,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8400503be0> has no local changes
2024-11-04 00:43:22,596 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:22,606 [ scc.git] DEBUG [detached HEAD aa4e854] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:22,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:22,606 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:22,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-04 00:43:23,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-04 00:43:23,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-04 00:43:24,382 [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-04 00:43:24,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-04 00:43:25,199 [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-04 00:43:25,200 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-04 00:43:25,200 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:25,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-04 00:43:25,200 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:25,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:25,206 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:25,210 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:25,210 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:25,219 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:25,225 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:25,226 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-04 00:43:25,587 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-04 00:43:25,587 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-04 00:43:25,591 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:25,591 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:25,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:25,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-04 00:43:25,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:25,606 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-04 00:43:25,614 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:25,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:25,748 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:25,785 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:25,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:25,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:25,825 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:25,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004c9fa0> has no local changes
2024-11-04 00:43:25,831 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:25,838 [ scc.git] DEBUG [detached HEAD 602be95] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:25,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:25,839 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:26,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-04 00:43:26,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-04 00:43:27,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-04 00:43:27,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-04 00:43:28,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-04 00:43:28,577 [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-04 00:43:29,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-04 00:43:29,434 [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-04 00:43:29,435 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-04 00:43:29,435 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:29,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-04 00:43:29,435 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:29,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:29,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:29,445 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:29,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:29,450 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:29,455 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:29,455 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-04 00:43:29,753 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-04 00:43:29,753 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-04 00:43:29,757 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:29,758 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:29,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:29,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-04 00:43:29,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:29,772 [ 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-04 00:43:29,780 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-04 00:43:29,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:29,783 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-04 00:43:29,783 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-04 00:43:29,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:29,913 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:29,949 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:29,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:29,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:29,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:29,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004b6c70> has no local changes
2024-11-04 00:43:29,997 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:30,005 [ scc.git] DEBUG [detached HEAD 5726aec] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:30,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:30,006 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:30,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-04 00:43:30,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-04 00:43:31,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-04 00:43:31,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-04 00:43:32,433 [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-04 00:43:32,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-04 00:43:33,401 [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-04 00:43:33,402 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-04 00:43:33,402 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:33,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-04 00:43:33,403 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:33,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:33,408 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:33,412 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:33,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:33,417 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:33,422 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:33,422 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-04 00:43:33,781 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-04 00:43:33,782 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-04 00:43:33,785 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:33,785 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:33,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:33,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-04 00:43:33,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:33,799 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-04 00:43:33,858 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG Auto-merging setup.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-04 00:43:33,858 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:33,859 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:33,864 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-04 00:43:33,870 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-04 00:43:34,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:34,003 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-04 00:43:34,008 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-04 00:43:34,013 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-11-04 00:43:34,017 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:34,017 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-04 00:43:34,017 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:34,056 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:34,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:34,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:34,097 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:34,102 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004c0fd0> has no local changes
2024-11-04 00:43:34,102 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:34,110 [ scc.git] DEBUG [detached HEAD d314090] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:34,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:34,110 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:34,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-04 00:43:34,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-04 00:43:35,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-04 00:43:35,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-04 00:43:36,327 [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-04 00:43:36,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-04 00:43:37,144 [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-04 00:43:37,144 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-04 00:43:37,144 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:37,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-04 00:43:37,145 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:37,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:37,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:37,156 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:37,156 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:37,161 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:37,165 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:37,166 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-04 00:43:37,464 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-04 00:43:37,464 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-04 00:43:37,469 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:37,469 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:37,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:37,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-04 00:43:37,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:37,485 [ 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-04 00:43:37,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:37,499 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-04 00:43:37,499 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-04 00:43:37,499 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-04 00:43:37,499 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-04 00:43:37,500 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-04 00:43:37,500 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-04 00:43:37,500 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-04 00:43:37,500 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-04 00:43:37,501 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-04 00:43:37,501 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-04 00:43:37,501 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-04 00:43:37,502 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-04 00:43:37,502 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-04 00:43:37,502 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-04 00:43:37,503 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-04 00:43:37,503 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-04 00:43:37,503 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-04 00:43:37,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:37,625 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:37,664 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:37,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:37,670 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:37,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:37,715 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004c95b0> has no local changes
2024-11-04 00:43:37,715 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:37,723 [ scc.git] DEBUG [detached HEAD de5ffab] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:37,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:37,723 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:38,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-04 00:43:38,042 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:38,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-04 00:43:38,042 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,047 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:38,051 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:38,051 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:38,056 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:38,060 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:38,061 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:38,061 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,065 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:38,103 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,107 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:38,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:38,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84004832e0> has no local changes
2024-11-04 00:43:38,150 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:38,157 [ scc.git] DEBUG [detached HEAD 6d804bf] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:38,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:38,158 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:38,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-11-04 00:43:38,459 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:38,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-04 00:43:38,459 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,464 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:38,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:38,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:38,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:38,478 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:38,479 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:38,479 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,483 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:38,520 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:38,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:38,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:38,561 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:38,568 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f840042c100> has no local changes
2024-11-04 00:43:38,568 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:38,604 [ scc.git] DEBUG [detached HEAD 366c4db] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:38,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:38,605 [ scc.git] INFO Overriding base-branch from master to main
2024-11-04 00:43:38,605 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:38,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-04 00:43:39,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-04 00:43:39,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-04 00:43:40,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-04 00:43:40,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-04 00:43:41,193 [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-04 00:43:41,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-04 00:43:42,006 [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-04 00:43:42,007 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-04 00:43:42,007 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:42,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-04 00:43:42,007 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:42,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,013 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-04 00:43:42,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:42,017 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-04 00:43:42,022 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-04 00:43:42,027 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:42,027 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-04 00:43:42,372 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-04 00:43:42,372 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-04 00:43:42,377 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:42,377 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:42,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-04 00:43:42,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-04 00:43:42,415 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-04 00:43:42,416 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-04 00:43:42,416 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:42,416 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:42,422 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-04 00:43:42,428 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-04 00:43:42,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:42,567 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-04 00:43:42,574 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-04 00:43:42,579 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-04 00:43:42,583 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:42,584 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-04 00:43:42,584 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:42,623 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:42,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,628 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:42,666 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:42,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8400460eb0> has no local changes
2024-11-04 00:43:42,673 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:42,682 [ scc.git] DEBUG [detached HEAD bdfec27] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:42,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:42,682 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:42,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-04 00:43:42,965 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:42,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-04 00:43:42,965 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:42,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:42,976 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:42,976 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:42,981 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:42,987 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:42,987 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:42,987 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:42,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:42,991 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:43,027 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:43,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:43,032 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:43,067 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:43,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f840042cb80> has no local changes
2024-11-04 00:43:43,072 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:43,080 [ scc.git] DEBUG [detached HEAD 6249dac] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:43,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:43,081 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:43,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-04 00:43:43,380 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:43,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-04 00:43:43,380 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:43,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:43,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:43,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:43,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:43,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:43,400 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:43,400 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:43,400 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:43,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:43,405 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:43,440 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:43,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:43,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:43,480 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:43,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8400437e80> has no local changes
2024-11-04 00:43:43,486 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:43,494 [ scc.git] DEBUG [detached HEAD 057b5c1] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:43,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:43,494 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:43,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-04 00:43:44,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-04 00:43:44,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-04 00:43:45,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-04 00:43:45,727 [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-04 00:43:46,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-04 00:43:46,531 [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-04 00:43:46,531 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-04 00:43:46,531 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:46,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-04 00:43:46,532 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:46,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:46,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-04 00:43:46,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:46,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-04 00:43:46,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-04 00:43:46,552 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:46,552 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-04 00:43:46,893 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-04 00:43:46,893 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-04 00:43:46,899 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:46,899 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:46,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:46,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-04 00:43:46,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:46,914 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-04 00:43:46,944 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-04 00:43:46,944 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-04 00:43:46,944 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:46,944 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:46,950 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-04 00:43:46,956 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-04 00:43:47,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:47,095 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-04 00:43:47,101 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-04 00:43:47,106 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-04 00:43:47,111 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:47,111 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-04 00:43:47,111 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:47,147 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:47,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:47,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:47,188 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:47,194 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8400428a90> has no local changes
2024-11-04 00:43:47,194 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:47,203 [ scc.git] DEBUG [detached HEAD 45857a5] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:47,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:47,204 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-04 00:43:47,204 [ scc.repo] DEBUG ## PRs found:
2024-11-04 00:43:47,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-04 00:43:48,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-04 00:43:48,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-04 00:43:49,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-04 00:43:49,454 [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-04 00:43:49,867 [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-04 00:43:50,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-04 00:43:50,686 [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-04 00:43:50,687 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-04 00:43:51,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-04 00:43:51,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-04 00:43:52,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-04 00:43:52,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-04 00:43:53,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-04 00:43:53,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-04 00:43:53,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-04 00:43:54,407 [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-04 00:43:54,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-04 00:43:55,225 [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-04 00:43:55,225 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-04 00:43:55,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-04 00:43:56,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-04 00:43:56,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-04 00:43:57,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-04 00:43:57,128 [ scc.repo] DEBUG ## Branches found:
2024-11-04 00:43:57,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-04 00:43:57,129 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:57,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:57,136 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-04 00:43:57,141 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-04 00:43:57,141 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-04 00:43:57,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-04 00:43:57,154 [ scc.git] DEBUG Already up to date.
2024-11-04 00:43:57,154 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-04 00:43:57,487 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-04 00:43:57,487 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-04 00:43:57,492 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-04 00:43:57,792 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-04 00:43:57,792 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-04 00:43:57,797 [ scc.git] DEBUG ## Unique users: []
2024-11-04 00:43:57,797 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:57,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:57,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-04 00:43:57,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:57,814 [ 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-04 00:43:57,824 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-04 00:43:57,824 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-04 00:43:57,824 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-04 00:43:57,824 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-04 00:43:57,829 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-04 00:43:57,835 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-04 00:43:57,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:57,963 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-04 00:43:57,970 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-04 00:43:57,975 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#232](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-04 00:43:57,979 [ scc.config] DEBUG Found github.token
2024-11-04 00:43:57,980 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-04 00:43:57,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-04 00:43:57,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:57,989 [ 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-04 00:43:57,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-04 00:43:58,001 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-04 00:43:58,001 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-04 00:43:58,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:58,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-04 00:43:58,383 [ scc.git] DEBUG Get sha1 of %s
2024-11-04 00:43:58,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-04 00:43:58,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:58,423 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:43:58,429 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f840040d520> has no local changes
2024-11-04 00:43:58,429 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:43:58,437 [ scc.git] DEBUG [detached HEAD 61d778f] merge master -Dorg -Ssuccess-only
2024-11-04 00:43:58,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:43:58,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-04 00:43:58,510 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-04 00:43:58,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:58,736 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-04 00:43:58,741 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-04 00:43:59,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:59,120 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-04 00:43:59,125 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-04 00:43:59,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:59,505 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-04 00:43:59,509 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-04 00:43:59,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:43:59,896 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-04 00:44:00,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:00,335 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-04 00:44:00,339 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-04 00:44:00,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:00,709 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-04 00:44:00,714 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-04 00:44:01,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:01,112 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-04 00:44:01,116 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-04 00:44:01,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:01,501 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-04 00:44:01,505 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-04 00:44:01,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:01,878 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-04 00:44:01,882 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-04 00:44:02,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:02,283 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-04 00:44:02,287 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-04 00:44:02,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:02,670 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-04 00:44:02,674 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-04 00:44:03,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:03,048 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-04 00:44:03,053 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-04 00:44:03,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:03,427 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-04 00:44:03,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:03,818 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-04 00:44:04,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:04,204 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-04 00:44:04,209 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-04 00:44:04,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:04,595 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-04 00:44:04,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:04,976 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-04 00:44:05,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:05,367 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-04 00:44:05,372 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-04 00:44:05,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:05,751 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-04 00:44:05,755 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-04 00:44:06,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:06,127 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-04 00:44:06,131 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-04 00:44:06,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:06,502 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-04 00:44:06,506 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-04 00:44:06,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-04 00:44:06,884 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-04 00:44:06,885 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-04 00:44:06,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f84012fd8b0> has local changes
2024-11-04 00:44:06,962 [ 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#232 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/232/)'
2024-11-04 00:44:06,990 [ scc.git] DEBUG [detached HEAD 775e4ea] merge master -Dorg -Ssuccess-only
2024-11-04 00:44:06,990 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-04 00:44:06,990 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-04 00:44:06,991 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-04 00:44:06,991 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-04 00:44:06,991 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-04 00:44:06,991 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-04 00:44:06,991 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-11-04 00:44:06,991 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-04 00:44:06,991 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-04 00:44:06,991 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,991 [ scc.merge] INFO
2024-11-04 00:44:06,991 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,991 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-04 00:44:06,992 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-04 00:44:06,992 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-04 00:44:06,992 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-04 00:44:06,992 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,992 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-04 00:44:06,992 [ scc.merge] INFO
2024-11-04 00:44:06,992 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-04 00:44:06,992 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,992 [ 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-04 00:44:06,992 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-04 00:44:06,993 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-04 00:44:06,993 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-04 00:44:06,993 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 90 jburel 'Update gha'
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-04 00:44:06,993 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 88 jburel 'Update gha'
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-04 00:44:06,993 [ scc.merge] INFO
2024-11-04 00:44:06,993 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-04 00:44:06,993 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,993 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-04 00:44:06,994 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,994 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-04 00:44:06,994 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO
2024-11-04 00:44:06,994 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-04 00:44:06,995 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Repository: ome/scripts
2024-11-04 00:44:06,995 [ scc.merge] INFO Excluded PRs:
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-04 00:44:06,995 [ scc.merge] INFO Already up to date.
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Merged PRs:
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,995 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-04 00:44:06,995 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-04 00:44:06,995 [ scc.merge] INFO
2024-11-04 00:44:06,996 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-04 00:44:06,996 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-04 00:44:07,002 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-04 00:44:07,007 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-04 00:44:07,012 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-04 00:44:07,018 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-04 00:44:07,023 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-04 00:44:07,028 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-04 00:44:07,034 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-04 00:44:07,039 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-04 00:44:07,044 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-04 00:44:07,050 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-04 00:44:07,055 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-04 00:44:07,060 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-04 00:44:07,065 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-04 00:44:07,071 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-04 00:44:07,076 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-04 00:44:07,080 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-04 00:44:07,086 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-04 00:44:07,091 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-04 00:44:07,097 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-04 00:44:07,102 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-04 00:44:07,108 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-04 00:44:07,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-04 00:44:07,112 [ scc.git] DEBUG Calling 'git remote'
2024-11-04 00:44:07,117 [ 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 0350307] 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 146b35b] 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-04 00:44:50,779 [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-04 00:44:59,305 [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-04 00:45:01,553 [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-04 00:45:06,009 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-04 00:45:44,747 [ 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/a3382f31/images/svgs/logo.svg){kind=logo}
