Console Output
Skipping 115 KB..
Full Logero-iviewer/issues/484 HTTP/1.1" 200 None
2024-10-29 10:45:28,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-10-29 10:45:28,200 [ scc.repo] DEBUG # ... Include label: include
2024-10-29 10:45:28,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-10-29 10:45:29,203 [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-10-29 10:45:29,646 [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-10-29 10:45:30,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-10-29 10:45:30,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:30,617 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-10-29 10:45:31,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-10-29 10:45:31,090 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:45:31,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-29 10:45:32,226 [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-10-29 10:45:32,677 [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-10-29 10:45:33,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-29 10:45:33,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:33,630 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-29 10:45:34,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-10-29 10:45:34,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-10-29 10:45:35,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-29 10:45:35,527 [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-10-29 10:45:35,990 [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-10-29 10:45:36,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-29 10:45:36,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:36,863 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-29 10:45:37,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-10-29 10:45:37,321 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:45:37,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-29 10:45:38,429 [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-10-29 10:45:38,906 [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-10-29 10:45:39,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-29 10:45:39,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:39,729 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-29 10:45:40,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-10-29 10:45:40,168 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:45:40,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-29 10:45:41,413 [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-10-29 10:45:41,934 [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-10-29 10:45:42,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-29 10:45:42,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:42,880 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-29 10:45:43,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-10-29 10:45:43,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-10-29 10:45:44,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-29 10:45:44,788 [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-10-29 10:45:45,227 [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-10-29 10:45:45,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-29 10:45:46,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:46,171 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-29 10:45:46,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-10-29 10:45:47,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-10-29 10:45:47,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-29 10:45:48,197 [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-10-29 10:45:48,698 [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-10-29 10:45:49,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-29 10:45:49,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:49,629 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-10-29 10:45:50,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-10-29 10:45:50,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-10-29 10:45:51,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-29 10:45:51,504 [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-10-29 10:45:52,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-29 10:45:52,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:45:52,418 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-10-29 10:45:52,418 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:45:52,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-29 10:45:52,419 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:45:52,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:52,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:45:52,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:45:52,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:45:52,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:45:52,439 [ scc.git] DEBUG Already up to date.
2024-10-29 10:45:52,439 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-10-29 10:45:53,161 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:53,162 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-10-29 10:45:53,165 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-10-29 10:45:54,764 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:54,764 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-10-29 10:45:54,768 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-10-29 10:45:55,187 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:55,187 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-10-29 10:45:55,190 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-10-29 10:45:55,473 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:55,473 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-10-29 10:45:55,477 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-10-29 10:45:55,756 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:55,757 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-10-29 10:45:55,760 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-10-29 10:45:56,331 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:56,331 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-10-29 10:45:56,334 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-10-29 10:45:56,616 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:56,616 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-10-29 10:45:56,620 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-10-29 10:45:57,749 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:57,749 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-10-29 10:45:57,753 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-10-29 10:45:58,318 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-29 10:45:58,319 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-10-29 10:45:58,322 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:45:58,322 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:45:58,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:58,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-29 10:45:58,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:58,337 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-29 10:45:58,500 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-29 10:45:58,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:45:58,503 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-10-29 10:45:58,503 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-10-29 10:45:58,503 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-10-29 10:45:58,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:45:58,644 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-29 10:45:58,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:58,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-29 10:45:58,672 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-10-29 10:45:58,672 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-29 10:45:58,672 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-29 10:45:58,672 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-10-29 10:45:58,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:45:58,676 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-10-29 10:45:58,676 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-10-29 10:45:58,676 [ scc.git] DEBUG src/app/header.html | 5 +
2024-10-29 10:45:58,676 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-10-29 10:45:58,676 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-10-29 10:45:58,676 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-10-29 10:45:58,676 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-10-29 10:45:58,676 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-10-29 10:45:59,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:45:59,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-29 10:45:59,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:59,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-29 10:45:59,100 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-10-29 10:45:59,100 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:45:59,103 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-10-29 10:45:59,103 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-10-29 10:45:59,103 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-10-29 10:45:59,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:45:59,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-29 10:45:59,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:59,419 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-29 10:45:59,468 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:45:59,477 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-10-29 10:45:59,477 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-10-29 10:45:59,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:45:59,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-10-29 10:45:59,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:45:59,808 [ 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-10-29 10:45:59,841 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-29 10:45:59,841 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:00,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:00,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-10-29 10:46:00,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:00,193 [ 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-10-29 10:46:00,527 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-29 10:46:00,527 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-29 10:46:00,527 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-29 10:46:00,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-10-29 10:46:00,531 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-10-29 10:46:00,531 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-10-29 10:46:00,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:00,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-10-29 10:46:00,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:00,681 [ 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-10-29 10:46:00,775 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-29 10:46:00,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:00,785 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-10-29 10:46:00,785 [ scc.git] DEBUG package.json | 2 +-
2024-10-29 10:46:00,785 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-10-29 10:46:01,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:01,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-10-29 10:46:01,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:01,070 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-10-29 10:46:01,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:01,088 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-10-29 10:46:01,088 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-10-29 10:46:01,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:01,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-10-29 10:46:01,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:01,455 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-10-29 10:46:01,564 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-10-29 10:46:01,564 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-10-29 10:46:01,564 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:46:01,565 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:46:01,570 [ scc.git] DEBUG Calling 'git reset --hard 6dbaffba2ce9467e0cf38dac5baba0f5c1f52c76'
2024-10-29 10:46:01,577 [ scc.git] DEBUG HEAD is now at 6dbaffb merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-10-29 10:46:01,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:01,821 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-10-29 10:46:01,825 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-10-29 10:46:01,830 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- PR #482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- src/utils/ui.js
--conflicts
2024-10-29 10:46:01,835 [ scc.config] DEBUG Found github.token
2024-10-29 10:46:01,835 [ scc.git] DEBUG Adding comment to issue #488.
2024-10-29 10:46:02,891 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-10-29 10:46:02,892 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:02,927 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:02,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:02,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:02,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:02,975 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b1bcc400> has no local changes
2024-10-29 10:46:02,975 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:02,982 [ scc.git] DEBUG [detached HEAD e6ef4a6] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:02,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:02,983 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:03,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-10-29 10:46:03,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/88 HTTP/1.1" 200 None
2024-10-29 10:46:04,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/88/comments HTTP/1.1" 200 None
2024-10-29 10:46:04,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/b58b599ed5b65135cc4d7bac0382b6944579eb6f HTTP/1.1" 200 None
2024-10-29 10:46:05,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/b58b599ed5b65135cc4d7bac0382b6944579eb6f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-29 10:46:05,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/b58b599ed5b65135cc4d7bac0382b6944579eb6f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-29 10:46:06,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/b58b599ed5b65135cc4d7bac0382b6944579eb6f HTTP/1.1" 200 None
2024-10-29 10:46:06,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/b58b599ed5b65135cc4d7bac0382b6944579eb6f?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:06,746 [ scc.repo] DEBUG - PR 88 pwalczysko 'Fix build jinja2'
2024-10-29 10:46:07,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/87 HTTP/1.1" 200 None
2024-10-29 10:46:07,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/87/comments HTTP/1.1" 200 None
2024-10-29 10:46:08,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a HTTP/1.1" 200 None
2024-10-29 10:46:08,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-29 10:46:09,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-29 10:46:09,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-10-29 10:46:10,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-10-29 10:46:10,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b HTTP/1.1" 200 None
2024-10-29 10:46:10,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-29 10:46:11,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-29 10:46:11,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-10-29 10:46:12,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-10-29 10:46:12,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-29 10:46:13,280 [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-10-29 10:46:13,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-29 10:46:14,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:14,133 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-10-29 10:46:14,133 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:14,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-29 10:46:14,133 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:14,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:14,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:14,143 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:14,143 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:14,148 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:14,153 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:14,153 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-10-29 10:46:14,463 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-10-29 10:46:14,463 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-10-29 10:46:14,467 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-10-29 10:46:14,901 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-10-29 10:46:14,901 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-10-29 10:46:14,905 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:14,905 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:14,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:14,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-29 10:46:14,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:14,921 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-29 10:46:14,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:14,932 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-10-29 10:46:14,932 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-10-29 10:46:14,932 [ scc.git] DEBUG requirements.txt | 2 +-
2024-10-29 10:46:14,932 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-10-29 10:46:14,932 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-10-29 10:46:14,932 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-10-29 10:46:15,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:15,068 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b58b599ed5b65135cc4d7bac0382b6944579eb6f'
2024-10-29 10:46:15,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:15,077 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Fix build jinja2) b58b599ed5b65135cc4d7bac0382b6944579eb6f'
2024-10-29 10:46:15,104 [ scc.git] DEBUG Auto-merging requirements.txt
2024-10-29 10:46:15,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in requirements.txt
2024-10-29 10:46:15,104 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:46:15,105 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:46:15,109 [ scc.git] DEBUG Calling 'git reset --hard f0ff871b000ae8c11bc80018abac741e1efc91b1'
2024-10-29 10:46:15,115 [ scc.git] DEBUG HEAD is now at f0ff871 merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient)
2024-10-29 10:46:15,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:15,503 [ scc.git] DEBUG Calling 'git merge-base 9631b155c44fcec9986b03315dd9f5c5c64aa7eb b58b599ed5b65135cc4d7bac0382b6944579eb6f'
2024-10-29 10:46:15,507 [ scc.git] DEBUG Calling 'git diff --name-only 9631b155c44fcec9986b03315dd9f5c5c64aa7eb..9631b155c44fcec9986b03315dd9f5c5c64aa7eb'
2024-10-29 10:46:15,512 [ scc.git] INFO - PR 88 pwalczysko 'Fix build jinja2'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- PR #74 will-moore 'mapr extension of webclient'
- requirements.txt
--conflicts
2024-10-29 10:46:15,516 [ scc.config] DEBUG Found github.token
2024-10-29 10:46:15,516 [ scc.git] DEBUG Adding comment to issue #88.
2024-10-29 10:46:16,269 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-mapr/issues/88/comments HTTP/1.1" 201 2002
2024-10-29 10:46:16,270 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:16,305 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:16,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:16,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:16,343 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:16,349 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0bb5760> has no local changes
2024-10-29 10:46:16,349 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 87 will-moore 'Tests dont use omero utils' (status: failure)
- PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Conflicting PRs (not included):
- PR 88 pwalczysko 'Fix build jinja2'
Generated by OMERO-plugins-push#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:16,356 [ scc.git] DEBUG [detached HEAD d91e0b8] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:16,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:16,357 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:16,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-10-29 10:46:17,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-10-29 10:46:17,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-10-29 10:46:18,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-29 10:46:18,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-29 10:46:19,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-29 10:46:19,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:19,720 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-10-29 10:46:20,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-10-29 10:46:20,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-10-29 10:46:21,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-29 10:46:21,651 [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-10-29 10:46:22,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-29 10:46:22,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:22,547 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-29 10:46:22,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-10-29 10:46:23,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-10-29 10:46:23,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-29 10:46:24,401 [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-10-29 10:46:25,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-29 10:46:25,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:25,480 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-29 10:46:25,480 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:25,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-29 10:46:25,480 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:25,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:25,485 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:25,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:25,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:25,494 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:25,499 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:25,500 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-10-29 10:46:25,808 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-29 10:46:25,808 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-10-29 10:46:25,812 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-10-29 10:46:26,105 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-29 10:46:26,105 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-10-29 10:46:26,109 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-10-29 10:46:26,389 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-29 10:46:26,389 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-10-29 10:46:26,392 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:26,393 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:26,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:26,397 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-29 10:46:26,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:26,407 [ 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-10-29 10:46:26,420 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-10-29 10:46:26,420 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-10-29 10:46:26,420 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-29 10:46:26,420 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-29 10:46:26,420 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:46:26,421 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:46:26,426 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-29 10:46:26,433 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-29 10:46:26,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:26,595 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-29 10:46:26,601 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-29 10:46:26,606 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-10-29 10:46:26,610 [ scc.config] DEBUG Found github.token
2024-10-29 10:46:26,610 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-10-29 10:46:26,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-29 10:46:26,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:26,621 [ 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-10-29 10:46:26,636 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-29 10:46:26,636 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-29 10:46:26,636 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-10-29 10:46:26,636 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:46:26,636 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:46:26,641 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-29 10:46:26,648 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-29 10:46:26,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:26,978 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-29 10:46:26,984 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-29 10:46:26,989 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/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-10-29 10:46:26,993 [ scc.config] DEBUG Found github.token
2024-10-29 10:46:26,993 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-10-29 10:46:26,993 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-29 10:46:26,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:27,003 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-29 10:46:27,012 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:27,015 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-10-29 10:46:27,015 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-10-29 10:46:27,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:27,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:27,402 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:27,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:27,406 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:27,440 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:27,445 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0b8beb0> has no local changes
2024-10-29 10:46:27,446 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:27,453 [ scc.git] DEBUG [detached HEAD 56c6366] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:27,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:27,454 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:27,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-10-29 10:46:28,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-10-29 10:46:28,385 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:46:29,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-29 10:46:29,635 [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-10-29 10:46:30,074 [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-10-29 10:46:30,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-29 10:46:31,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:31,069 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-29 10:46:31,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-10-29 10:46:31,524 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:46:32,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-29 10:46:32,552 [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-10-29 10:46:33,028 [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-10-29 10:46:33,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-29 10:46:34,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:34,049 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-29 10:46:34,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-10-29 10:46:34,519 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-29 10:46:35,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-29 10:46:35,611 [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-10-29 10:46:36,075 [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-10-29 10:46:36,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-29 10:46:37,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:37,116 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-29 10:46:37,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-10-29 10:46:38,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-10-29 10:46:38,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-10-29 10:46:38,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-10-29 10:46:39,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-10-29 10:46:39,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-10-29 10:46:39,872 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:39,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-29 10:46:39,872 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:39,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:39,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:39,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:39,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:39,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:39,893 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:39,893 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-10-29 10:46:40,206 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-29 10:46:40,206 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-10-29 10:46:40,210 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-10-29 10:46:40,508 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-29 10:46:40,508 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-10-29 10:46:40,512 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-10-29 10:46:40,793 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-29 10:46:40,793 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-10-29 10:46:40,797 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:40,797 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:40,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:40,802 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-10-29 10:46:40,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:40,811 [ 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-10-29 10:46:40,820 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:40,822 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-10-29 10:46:40,822 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-10-29 10:46:40,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:40,963 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-10-29 10:46:40,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:40,972 [ 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-10-29 10:46:40,999 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-29 10:46:41,000 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:41,003 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-10-29 10:46:41,003 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-10-29 10:46:41,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:41,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-10-29 10:46:41,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:41,359 [ 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-10-29 10:46:41,428 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-29 10:46:41,429 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:41,432 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-10-29 10:46:41,432 [ scc.git] DEBUG package.json | 2 +-
2024-10-29 10:46:41,432 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-10-29 10:46:41,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:41,796 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:41,831 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:41,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:41,835 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:41,869 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:41,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0bb0df0> has no local changes
2024-10-29 10:46:41,875 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:41,883 [ scc.git] DEBUG [detached HEAD 76fd246] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:41,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:41,884 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:42,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-10-29 10:46:42,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-10-29 10:46:43,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-29 10:46:43,751 [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-10-29 10:46:44,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-29 10:46:44,640 [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-10-29 10:46:44,641 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-10-29 10:46:44,641 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:44,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-29 10:46:44,641 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:44,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:44,647 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:44,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:44,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:44,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:44,661 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:44,661 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-29 10:46:44,988 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-10-29 10:46:44,988 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-29 10:46:44,992 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:44,992 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:44,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:44,997 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-29 10:46:45,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:45,006 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-29 10:46:45,014 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:45,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:45,183 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:45,218 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:45,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:45,223 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:45,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:45,262 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0373640> has no local changes
2024-10-29 10:46:45,262 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:45,269 [ scc.git] DEBUG [detached HEAD feb63c7] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:45,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:45,269 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:45,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-10-29 10:46:46,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-10-29 10:46:46,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-10-29 10:46:47,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-10-29 10:46:47,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-29 10:46:48,028 [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-10-29 10:46:48,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-29 10:46:48,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:48,911 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-29 10:46:48,911 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:48,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-29 10:46:48,912 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:48,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:48,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:48,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:48,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:48,926 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:48,931 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:48,932 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-10-29 10:46:49,252 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-10-29 10:46:49,252 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-10-29 10:46:49,255 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:49,255 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:49,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:49,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-10-29 10:46:49,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:49,270 [ 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-10-29 10:46:49,278 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-10-29 10:46:49,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:49,281 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-10-29 10:46:49,281 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-10-29 10:46:49,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:49,430 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:49,465 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:49,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:49,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:49,503 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:49,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0360ac0> has no local changes
2024-10-29 10:46:49,509 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:49,516 [ scc.git] DEBUG [detached HEAD 101f724] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:49,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:49,517 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:49,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-10-29 10:46:50,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-10-29 10:46:50,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-10-29 10:46:51,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-29 10:46:51,866 [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-10-29 10:46:52,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-29 10:46:52,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:46:52,799 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-29 10:46:52,799 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:52,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-29 10:46:52,799 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:52,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:52,805 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:52,809 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:52,810 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:52,815 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:52,820 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:52,820 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-29 10:46:53,187 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-10-29 10:46:53,188 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-29 10:46:53,191 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:53,191 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:53,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:53,196 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-29 10:46:53,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:53,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-29 10:46:53,271 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG Auto-merging setup.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-10-29 10:46:53,271 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:46:53,271 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:46:53,276 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-29 10:46:53,282 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-10-29 10:46:53,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:53,419 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-29 10:46:53,424 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-29 10:46:53,429 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-10-29 10:46:53,434 [ scc.config] DEBUG Found github.token
2024-10-29 10:46:53,434 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-10-29 10:46:53,434 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:53,469 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:53,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:53,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:53,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:53,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0358fa0> has no local changes
2024-10-29 10:46:53,513 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:53,520 [ scc.git] DEBUG [detached HEAD 3521f6c] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:53,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:53,521 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:53,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-10-29 10:46:54,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-10-29 10:46:54,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-10-29 10:46:55,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-29 10:46:55,705 [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-10-29 10:46:56,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-29 10:46:56,531 [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-10-29 10:46:56,532 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-29 10:46:56,532 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:56,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-29 10:46:56,532 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:56,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:56,538 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:56,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:56,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:56,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:56,552 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:56,553 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-10-29 10:46:56,872 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-10-29 10:46:56,872 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-10-29 10:46:56,875 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:56,875 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:56,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:56,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-10-29 10:46:56,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:56,891 [ 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-10-29 10:46:56,903 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:46:56,905 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-10-29 10:46:56,905 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-10-29 10:46:56,906 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-10-29 10:46:56,906 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-10-29 10:46:56,906 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-10-29 10:46:56,906 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-10-29 10:46:56,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-10-29 10:46:56,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-10-29 10:46:56,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-10-29 10:46:56,908 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-10-29 10:46:56,908 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-10-29 10:46:56,908 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-10-29 10:46:56,909 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-10-29 10:46:56,909 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-10-29 10:46:56,909 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-10-29 10:46:56,909 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-10-29 10:46:57,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:46:57,051 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:57,085 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:57,124 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:57,129 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0bb59a0> has no local changes
2024-10-29 10:46:57,130 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:57,137 [ scc.git] DEBUG [detached HEAD 7c4c11d] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:57,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:57,137 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:57,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-10-29 10:46:57,472 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:57,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-29 10:46:57,472 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:57,481 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:57,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:57,486 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:57,491 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:57,491 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:57,491 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,496 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:57,531 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:57,570 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:57,575 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b032e340> has no local changes
2024-10-29 10:46:57,576 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:57,583 [ scc.git] DEBUG [detached HEAD d5137f6] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:57,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:57,583 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:57,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-10-29 10:46:57,883 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:46:57,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-29 10:46:57,883 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:46:57,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:46:57,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:46:57,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:46:57,902 [ scc.git] DEBUG Already up to date.
2024-10-29 10:46:57,902 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:46:57,902 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,906 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:46:57,940 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:46:57,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:46:57,945 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:46:57,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:46:57,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b02df9d0> has no local changes
2024-10-29 10:46:57,985 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:46:57,993 [ scc.git] DEBUG [detached HEAD c720ec9] merge master -Dorg -Ssuccess-only
2024-10-29 10:46:57,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:46:57,993 [ scc.git] INFO Overriding base-branch from master to main
2024-10-29 10:46:57,993 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:46:58,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-10-29 10:46:58,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-10-29 10:46:59,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-10-29 10:46:59,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-10-29 10:47:00,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-29 10:47:00,678 [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-10-29 10:47:01,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-29 10:47:01,606 [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-10-29 10:47:01,606 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-29 10:47:01,606 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:47:01,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-29 10:47:01,607 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:01,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:01,612 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-10-29 10:47:01,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:47:01,617 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-10-29 10:47:01,622 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-10-29 10:47:01,627 [ scc.git] DEBUG Already up to date.
2024-10-29 10:47:01,627 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-10-29 10:47:01,925 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-10-29 10:47:01,925 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-10-29 10:47:01,928 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:47:01,928 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:01,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:01,933 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-29 10:47:01,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:01,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-29 10:47:01,951 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-10-29 10:47:01,951 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-10-29 10:47:01,951 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:47:01,951 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:47:01,956 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-29 10:47:01,962 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-10-29 10:47:02,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:02,095 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-29 10:47:02,100 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-29 10:47:02,105 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-10-29 10:47:02,109 [ scc.config] DEBUG Found github.token
2024-10-29 10:47:02,109 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-10-29 10:47:02,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:47:02,144 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:02,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:02,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b02ffe20> has no local changes
2024-10-29 10:47:02,188 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:02,195 [ scc.git] DEBUG [detached HEAD 059332d] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:02,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:02,195 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:47:02,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-10-29 10:47:02,506 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:47:02,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-29 10:47:02,506 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,511 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:47:02,515 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:47:02,516 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:47:02,520 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:47:02,525 [ scc.git] DEBUG Already up to date.
2024-10-29 10:47:02,526 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:47:02,526 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,530 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:47:02,565 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,570 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:02,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:02,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b02df880> has no local changes
2024-10-29 10:47:02,609 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:02,665 [ scc.git] DEBUG [detached HEAD 06984e5] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:02,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:02,666 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:47:02,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-10-29 10:47:02,919 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:47:02,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-29 10:47:02,919 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:47:02,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:47:02,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:47:02,933 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:47:02,938 [ scc.git] DEBUG Already up to date.
2024-10-29 10:47:02,938 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:47:02,938 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,942 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:47:02,977 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:02,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:02,981 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:03,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:03,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b02dae80> has no local changes
2024-10-29 10:47:03,022 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:03,029 [ scc.git] DEBUG [detached HEAD ffce027] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:03,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:03,029 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:47:03,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-10-29 10:47:03,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-10-29 10:47:04,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-10-29 10:47:04,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-29 10:47:05,311 [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-10-29 10:47:05,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-29 10:47:06,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:47:06,187 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-10-29 10:47:06,187 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:47:06,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-29 10:47:06,187 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:06,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:06,193 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-29 10:47:06,197 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:47:06,198 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-29 10:47:06,202 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-29 10:47:06,207 [ scc.git] DEBUG Already up to date.
2024-10-29 10:47:06,208 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-10-29 10:47:06,524 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-10-29 10:47:06,525 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-10-29 10:47:06,528 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:47:06,528 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:06,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:06,533 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-29 10:47:06,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:06,543 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-29 10:47:06,552 [ scc.git] DEBUG Auto-merging Dockerfile
2024-10-29 10:47:06,553 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-10-29 10:47:06,553 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:47:06,553 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:47:06,558 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-29 10:47:06,564 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-10-29 10:47:06,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:06,696 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-29 10:47:06,701 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-29 10:47:06,705 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-10-29 10:47:06,710 [ scc.config] DEBUG Found github.token
2024-10-29 10:47:06,710 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-10-29 10:47:06,710 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:47:06,744 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:06,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:06,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:06,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:06,788 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b02c6a90> has no local changes
2024-10-29 10:47:06,788 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:06,796 [ scc.git] DEBUG [detached HEAD 18b18ad] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:06,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:06,796 [ scc.git] INFO Overriding base-branch from master to develop
2024-10-29 10:47:06,796 [ scc.repo] DEBUG ## PRs found:
2024-10-29 10:47:07,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-10-29 10:47:07,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-10-29 10:47:08,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-10-29 10:47:08,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-29 10:47:09,279 [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-10-29 10:47:09,744 [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-10-29 10:47:10,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-29 10:47:10,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:47:10,640 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-29 10:47:11,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-10-29 10:47:11,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-10-29 10:47:12,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-10-29 10:47:12,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-10-29 10:47:13,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-10-29 10:47:13,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-10-29 10:47:13,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-29 10:47:14,442 [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-10-29 10:47:14,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-29 10:47:15,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-10-29 10:47:15,290 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-29 10:47:15,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-10-29 10:47:16,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-10-29 10:47:16,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-10-29 10:47:17,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-10-29 10:47:17,220 [ scc.repo] DEBUG ## Branches found:
2024-10-29 10:47:17,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-29 10:47:17,221 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:17,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:17,226 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-10-29 10:47:17,231 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-29 10:47:17,231 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-10-29 10:47:17,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-10-29 10:47:17,242 [ scc.git] DEBUG Already up to date.
2024-10-29 10:47:17,242 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-10-29 10:47:17,574 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-29 10:47:17,574 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-10-29 10:47:17,578 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-10-29 10:47:17,896 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-29 10:47:17,896 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-10-29 10:47:17,899 [ scc.git] DEBUG ## Unique users: []
2024-10-29 10:47:17,899 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:17,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:17,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-29 10:47:17,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:17,915 [ 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-10-29 10:47:18,092 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-10-29 10:47:18,092 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-10-29 10:47:18,092 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-29 10:47:18,092 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-29 10:47:18,097 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-29 10:47:18,103 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-29 10:47:18,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:18,277 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-29 10:47:18,283 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-29 10:47:18,288 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#228](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-10-29 10:47:18,292 [ scc.config] DEBUG Found github.token
2024-10-29 10:47:18,293 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-10-29 10:47:18,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-29 10:47:18,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:18,302 [ 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-10-29 10:47:18,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-29 10:47:18,313 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-10-29 10:47:18,313 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-10-29 10:47:18,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:18,656 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-29 10:47:18,691 [ scc.git] DEBUG Get sha1 of %s
2024-10-29 10:47:18,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-29 10:47:18,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:18,731 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:18,737 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b0238520> has no local changes
2024-10-29 10:47:18,737 [ 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#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:18,744 [ scc.git] DEBUG [detached HEAD be842b3] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:18,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:18,745 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-29 10:47:18,814 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-10-29 10:47:19,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:19,049 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-10-29 10:47:19,053 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-10-29 10:47:19,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:19,432 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-10-29 10:47:19,436 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-10-29 10:47:19,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:19,815 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-10-29 10:47:19,819 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-10-29 10:47:20,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:20,202 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-10-29 10:47:20,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:20,581 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-10-29 10:47:20,586 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-10-29 10:47:20,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:20,967 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-10-29 10:47:20,971 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-10-29 10:47:21,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:21,351 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-10-29 10:47:21,355 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-10-29 10:47:21,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:21,736 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-10-29 10:47:21,741 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-10-29 10:47:22,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:22,219 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-10-29 10:47:22,223 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-10-29 10:47:22,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:22,611 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-10-29 10:47:22,616 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-10-29 10:47:22,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:23,001 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-10-29 10:47:23,006 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-10-29 10:47:23,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:23,387 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-10-29 10:47:23,391 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-10-29 10:47:23,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:23,770 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-10-29 10:47:24,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:24,152 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-10-29 10:47:24,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:24,530 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-10-29 10:47:24,535 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-10-29 10:47:24,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:24,915 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-10-29 10:47:25,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:25,295 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-10-29 10:47:25,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:25,673 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-10-29 10:47:25,677 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-10-29 10:47:26,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:26,061 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-10-29 10:47:26,065 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-10-29 10:47:26,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:26,446 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-10-29 10:47:26,450 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-10-29 10:47:26,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:26,855 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-10-29 10:47:26,859 [ scc.config] DEBUG Found submodule.scripts.url
2024-10-29 10:47:27,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-29 10:47:27,235 [ scc.config] DEBUG Found submodule.scripts.branch
2024-10-29 10:47:27,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-29 10:47:27,309 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f93b2f278b0> has local changes
2024-10-29 10:47:27,309 [ 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 599 Tom-TBT 'Patch label text selection and cue for dragging' (status: None)
- 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'
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 87 will-moore 'Tests dont use omero utils' (status: failure)
- PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Conflicting PRs (not included):
- PR 88 pwalczysko 'Fix build jinja2'
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#228 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/228/)'
2024-10-29 10:47:27,323 [ scc.git] DEBUG [detached HEAD 3bf84ca] merge master -Dorg -Ssuccess-only
2024-10-29 10:47:27,323 [ scc.merge] INFO Repository: ome/omero-plugins
2024-10-29 10:47:27,323 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-10-29 10:47:27,323 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,323 [ scc.merge] INFO
2024-10-29 10:47:27,323 [ scc.merge] INFO
2024-10-29 10:47:27,323 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-10-29 10:47:27,323 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,323 [ scc.merge] INFO
2024-10-29 10:47:27,323 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,323 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-10-29 10:47:27,323 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-10-29 10:47:27,324 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-10-29 10:47:27,324 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-10-29 10:47:27,324 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-10-29 10:47:27,324 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-10-29 10:47:27,324 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-29 10:47:27,324 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,324 [ scc.merge] INFO Repository: ome/omero-figure
2024-10-29 10:47:27,324 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging' (status: None)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-10-29 10:47:27,324 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-10-29 10:47:27,324 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,324 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-10-29 10:47:27,325 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Repository: ome/omero-gallery
2024-10-29 10:47:27,325 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-10-29 10:47:27,325 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-10-29 10:47:27,325 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,325 [ scc.merge] INFO
2024-10-29 10:47:27,325 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-29 10:47:27,325 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Repository: ome/omero-mapr
2024-10-29 10:47:27,326 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 87 will-moore 'Tests dont use omero utils' (status: failure)
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-10-29 10:47:27,326 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 88 pwalczysko 'Fix build jinja2'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Repository: ome/omero-metadata
2024-10-29 10:47:27,326 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Repository: ome/omero-parade
2024-10-29 10:47:27,326 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-10-29 10:47:27,326 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,326 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-29 10:47:27,326 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-29 10:47:27,326 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-rois
2024-10-29 10:47:27,327 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-signup
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-upload
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,327 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-10-29 10:47:27,327 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,327 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-10-29 10:47:27,327 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,327 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-10-29 10:47:27,328 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-10-29 10:47:27,328 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-10-29 10:47:27,328 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Repository: ome/scripts
2024-10-29 10:47:27,328 [ scc.merge] INFO Excluded PRs:
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-10-29 10:47:27,328 [ scc.merge] INFO Already up to date.
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Merged PRs:
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-29 10:47:27,328 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-29 10:47:27,328 [ scc.merge] INFO
2024-10-29 10:47:27,328 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-29 10:47:27,328 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-10-29 10:47:27,333 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-10-29 10:47:27,338 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-10-29 10:47:27,342 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-10-29 10:47:27,347 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-10-29 10:47:27,351 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-10-29 10:47:27,356 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-29 10:47:27,360 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-29 10:47:27,365 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-29 10:47:27,370 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-29 10:47:27,374 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-29 10:47:27,379 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-29 10:47:27,383 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-29 10:47:27,388 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-29 10:47:27,392 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-29 10:47:27,397 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-29 10:47:27,401 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-29 10:47:27,406 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-29 10:47:27,411 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-29 10:47:27,415 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-29 10:47:27,420 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-29 10:47:27,424 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-29 10:47:27,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-29 10:47:27,429 [ scc.git] DEBUG Calling 'git remote'
2024-10-29 10:47:27,433 [ 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 27b754f] 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 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 7cab07d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-10-29 10:48:10,621 [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-10-29 10:48:19,399 [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-10-29 10:48:21,713 [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-10-29 10:48:26,274 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-10-29 10:49:06,148 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
