Console Output
Skipping 115 KB..
Full Log---------
2024-11-08 00:45:06,901 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-11-08 00:45:07,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:07,041 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:45:07,081 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:07,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:07,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:45:07,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:45:07,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea06f9580> has no local changes
2024-11-08 00:45:07,135 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:45:07,145 [ scc.git] DEBUG [detached HEAD c57b315] merge master -Dorg -Ssuccess-only
2024-11-08 00:45:07,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:45:07,145 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:45:07,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-11-08 00:45:08,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488 HTTP/1.1" 200 None
2024-11-08 00:45:08,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 200 None
2024-11-08 00:45:09,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427 HTTP/1.1" 200 None
2024-11-08 00:45:09,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:10,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:10,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427 HTTP/1.1" 200 None
2024-11-08 00:45:11,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/767995856fdb93be4060423195f3f604aa6e4427?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:11,095 [ scc.repo] DEBUG - PR 488 will-moore 'Mobile layout'
2024-11-08 00:45:11,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/486 HTTP/1.1" 200 None
2024-11-08 00:45:12,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485 HTTP/1.1" 200 None
2024-11-08 00:45:12,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485/comments HTTP/1.1" 200 None
2024-11-08 00:45:12,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484 HTTP/1.1" 200 None
2024-11-08 00:45:13,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-11-08 00:45:13,449 [ scc.repo] DEBUG # ... Include label: include
2024-11-08 00:45:13,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-08 00:45:14,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:14,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:15,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-11-08 00:45:15,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:15,733 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-11-08 00:45:16,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-11-08 00:45:16,177 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:45:16,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-08 00:45:17,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:17,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:18,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-11-08 00:45:18,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:18,734 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-08 00:45:19,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-11-08 00:45:19,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-11-08 00:45:20,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-08 00:45:20,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:21,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:21,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-11-08 00:45:21,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:22,000 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-08 00:45:22,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-11-08 00:45:22,454 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:45:23,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-08 00:45:23,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:24,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:24,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-11-08 00:45:24,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:24,915 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-08 00:45:25,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-11-08 00:45:25,384 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:45:25,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-08 00:45:26,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:26,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:27,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-11-08 00:45:27,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:27,923 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-08 00:45:28,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-08 00:45:28,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-08 00:45:29,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-08 00:45:29,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:30,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:30,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-08 00:45:31,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:31,173 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-08 00:45:31,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-08 00:45:32,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-08 00:45:32,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-08 00:45:33,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:33,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:34,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-08 00:45:34,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:34,485 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-08 00:45:34,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-08 00:45:35,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-08 00:45:35,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-08 00:45:36,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:36,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-08 00:45:37,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:37,233 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-08 00:45:37,233 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:45:37,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-08 00:45:37,234 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:37,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:37,241 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:45:37,246 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:45:37,246 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:45:37,362 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:45:37,369 [ scc.git] DEBUG Already up to date.
2024-11-08 00:45:37,370 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-08 00:45:37,967 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:37,967 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-08 00:45:37,972 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-08 00:45:38,547 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:38,548 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-08 00:45:38,553 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-08 00:45:38,837 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:38,837 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-08 00:45:38,841 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-11-08 00:45:39,139 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:39,139 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-11-08 00:45:39,144 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-11-08 00:45:39,428 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:39,428 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-11-08 00:45:39,432 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-11-08 00:45:39,714 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:39,714 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-11-08 00:45:39,718 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-11-08 00:45:39,996 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:39,996 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-11-08 00:45:40,000 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-11-08 00:45:40,714 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:40,714 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-11-08 00:45:40,719 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-11-08 00:45:41,337 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-08 00:45:41,337 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-11-08 00:45:41,342 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:45:41,342 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:41,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:41,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-08 00:45:41,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:41,359 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-08 00:45:41,780 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-08 00:45:41,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:41,784 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-08 00:45:41,784 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-08 00:45:41,784 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-08 00:45:41,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:41,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-08 00:45:41,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:41,935 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-08 00:45:42,479 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-08 00:45:42,479 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-08 00:45:42,479 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-08 00:45:42,480 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-08 00:45:42,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:42,484 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-08 00:45:42,484 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-08 00:45:42,484 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-08 00:45:42,484 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-08 00:45:42,485 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-08 00:45:42,485 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-08 00:45:42,485 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-08 00:45:42,485 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-08 00:45:42,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:42,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-08 00:45:42,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:42,659 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-08 00:45:42,672 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-08 00:45:42,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:42,676 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-08 00:45:42,676 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-08 00:45:42,676 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-08 00:45:43,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:43,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-08 00:45:43,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:43,052 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-11-08 00:45:43,174 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:43,185 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-11-08 00:45:43,185 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-11-08 00:45:43,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:43,421 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-08 00:45:43,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:43,452 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-11-08 00:45:43,578 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-08 00:45:43,579 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:43,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:43,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-08 00:45:43,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:43,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-11-08 00:45:44,207 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-08 00:45:44,207 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-08 00:45:44,207 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-08 00:45:44,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-11-08 00:45:44,212 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-11-08 00:45:44,212 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-11-08 00:45:44,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:44,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-08 00:45:44,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:44,385 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-11-08 00:45:44,826 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-08 00:45:44,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:44,836 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-11-08 00:45:44,837 [ scc.git] DEBUG package.json | 2 +-
2024-11-08 00:45:44,837 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-11-08 00:45:44,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:44,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-08 00:45:44,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:44,987 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-11-08 00:45:45,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:45,007 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-11-08 00:45:45,007 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-11-08 00:45:45,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:45,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-11-08 00:45:45,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:45,364 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-08 00:45:45,737 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-11-08 00:45:45,737 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-11-08 00:45:45,737 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:45:45,738 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:45:45,744 [ scc.git] DEBUG Calling 'git reset --hard d6c6a81c9f3a6e0f6965fd51b971e1f09ee7df07'
2024-11-08 00:45:45,752 [ scc.git] DEBUG HEAD is now at d6c6a81 merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-11-08 00:45:45,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:45,912 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-11-08 00:45:45,918 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-11-08 00:45:45,923 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- PR #482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- src/utils/ui.js
--conflicts
2024-11-08 00:45:45,929 [ scc.config] DEBUG Found github.token
2024-11-08 00:45:45,929 [ scc.git] DEBUG Adding comment to issue #488.
2024-11-08 00:45:46,733 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-11-08 00:45:46,734 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:45:46,775 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:46,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:46,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:45:46,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:45:46,826 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea06f9520> has no local changes
2024-11-08 00:45:46,826 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:45:46,835 [ scc.git] DEBUG [detached HEAD 0f9ba96] merge master -Dorg -Ssuccess-only
2024-11-08 00:45:46,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:45:46,835 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:45:47,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-08 00:45:47,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/90 HTTP/1.1" 200 None
2024-11-08 00:45:48,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-08 00:45:48,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:49,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:49,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/ba2a65ad3901b65582775beda60b288e225b1003 HTTP/1.1" 200 None
2024-11-08 00:45:50,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/ba2a65ad3901b65582775beda60b288e225b1003?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:50,052 [ scc.repo] DEBUG - PR 90 jburel 'Update gha'
2024-11-08 00:45:50,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-08 00:45:50,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-08 00:45:51,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-08 00:45:51,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:52,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-08 00:45:52,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:52,807 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-08 00:45:52,807 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:45:52,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-08 00:45:52,808 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:52,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:52,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:45:52,819 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:45:52,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:45:52,825 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:45:52,836 [ scc.git] DEBUG Updating 3a505e4..d9953e4
2024-11-08 00:45:53,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls/86 HTTP/1.1" 200 None
2024-11-08 00:45:53,443 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-08 00:45:53,764 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-08 00:45:53,764 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-08 00:45:53,770 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-11-08 00:45:54,412 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-08 00:45:54,412 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-11-08 00:45:54,417 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:45:54,417 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:54,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:54,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-08 00:45:54,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:54,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-08 00:45:54,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:54,449 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-08 00:45:54,449 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-08 00:45:54,450 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-08 00:45:54,450 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-08 00:45:54,450 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-08 00:45:54,450 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-08 00:45:54,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:54,589 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-08 00:45:54,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:54,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Update gha) ba2a65ad3901b65582775beda60b288e225b1003'
2024-11-08 00:45:54,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:45:54,661 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-08 00:45:54,661 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-08 00:45:54,661 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-08 00:45:54,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:45:54,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:45:55,015 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:45:55,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:45:55,021 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:45:55,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:45:55,065 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea069a310> has no local changes
2024-11-08 00:45:55,065 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Updating 3a505e4..d9953e4
Previously merged:
- PR 86 will-moore 'fix return of default favicon if not found'
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 90 jburel 'Update gha'
Generated by OMERO-plugins-push#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:45:55,078 [ scc.git] DEBUG [detached HEAD b4ddac2] merge master -Dorg -Ssuccess-only
2024-11-08 00:45:55,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:45:55,078 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:45:55,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-08 00:45:55,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/88 HTTP/1.1" 200 None
2024-11-08 00:45:56,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-08 00:45:56,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:45:57,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:45:57,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/295b3c79ae9a35f8c588400f25e14fbcab329926 HTTP/1.1" 200 None
2024-11-08 00:45:58,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/295b3c79ae9a35f8c588400f25e14fbcab329926?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:45:58,225 [ scc.repo] DEBUG - PR 88 jburel 'Update gha'
2024-11-08 00:45:58,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-08 00:45:59,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-08 00:45:59,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-08 00:46:00,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:00,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-08 00:46:01,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:01,054 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-08 00:46:01,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-08 00:46:01,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-08 00:46:02,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-08 00:46:02,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:03,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-08 00:46:03,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:03,694 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-08 00:46:03,695 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:03,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-08 00:46:03,695 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:03,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:03,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:03,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:03,708 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:03,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:03,720 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:03,720 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-08 00:46:04,202 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-08 00:46:04,202 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-08 00:46:04,207 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-08 00:46:05,098 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-08 00:46:05,099 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-08 00:46:05,104 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2024-11-08 00:46:05,553 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-08 00:46:05,553 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2024-11-08 00:46:05,558 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:05,559 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:05,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:05,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-08 00:46:05,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:05,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-08 00:46:05,779 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-08 00:46:05,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-08 00:46:05,779 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-08 00:46:05,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-08 00:46:05,779 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:05,780 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:05,787 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-08 00:46:05,794 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-08 00:46:05,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:05,935 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-08 00:46:05,942 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-08 00:46:05,997 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-11-08 00:46:06,004 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:06,004 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-08 00:46:06,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-08 00:46:06,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:06,017 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-08 00:46:06,140 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-08 00:46:06,141 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-08 00:46:06,141 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-08 00:46:06,141 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:06,141 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:06,148 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-08 00:46:06,157 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-08 00:46:06,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:06,318 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-08 00:46:06,326 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-08 00:46:06,332 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-11-08 00:46:06,337 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:06,337 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-08 00:46:06,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-08 00:46:06,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:06,349 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Update gha) 295b3c79ae9a35f8c588400f25e14fbcab329926'
2024-11-08 00:46:06,439 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:06,442 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-08 00:46:06,442 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 8 +++++---
2024-11-08 00:46:06,442 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 4 deletions(-)
2024-11-08 00:46:06,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:06,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:06,752 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:06,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:06,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:06,800 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:06,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea06ded00> has no local changes
2024-11-08 00:46:06,809 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 88 jburel 'Update gha'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:06,819 [ scc.git] DEBUG [detached HEAD ab76b23] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:06,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:06,819 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:07,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-08 00:46:07,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-11-08 00:46:07,777 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:46:08,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-08 00:46:08,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:09,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:46:09,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-11-08 00:46:10,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:10,294 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-08 00:46:10,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-11-08 00:46:10,764 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:46:11,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-08 00:46:11,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:12,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:46:12,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-11-08 00:46:13,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:13,191 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-08 00:46:13,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-11-08 00:46:13,637 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-08 00:46:14,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-08 00:46:14,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:15,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:46:15,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-11-08 00:46:16,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:16,034 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-08 00:46:16,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-08 00:46:16,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-08 00:46:17,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-08 00:46:17,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-08 00:46:18,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-08 00:46:18,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-08 00:46:18,809 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:18,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-08 00:46:18,809 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:18,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:18,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:18,821 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:18,821 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:18,826 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:18,832 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:18,832 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-11-08 00:46:19,155 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-08 00:46:19,156 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-11-08 00:46:19,161 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-11-08 00:46:19,460 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-08 00:46:19,460 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-11-08 00:46:19,464 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-11-08 00:46:19,743 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-11-08 00:46:19,743 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-11-08 00:46:19,748 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:19,748 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:19,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:19,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-08 00:46:19,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:19,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-11-08 00:46:19,778 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:19,780 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-11-08 00:46:19,781 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-11-08 00:46:19,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:19,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-08 00:46:19,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:19,932 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-11-08 00:46:20,053 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-08 00:46:20,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:20,056 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-11-08 00:46:20,056 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-11-08 00:46:20,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:20,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-08 00:46:20,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:20,331 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-11-08 00:46:20,344 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-08 00:46:20,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:20,348 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-11-08 00:46:20,348 [ scc.git] DEBUG package.json | 2 +-
2024-11-08 00:46:20,348 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-11-08 00:46:20,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:20,705 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:20,746 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:20,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:20,752 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:20,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:20,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea0643640> has no local changes
2024-11-08 00:46:20,799 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:20,808 [ scc.git] DEBUG [detached HEAD bab82bb] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:20,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:20,808 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:21,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-08 00:46:21,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-08 00:46:22,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-08 00:46:22,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:23,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-08 00:46:23,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:23,511 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-08 00:46:23,512 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:23,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-08 00:46:23,512 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:23,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:23,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:23,524 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:23,524 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:23,531 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:23,538 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:23,538 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-08 00:46:23,863 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-08 00:46:23,863 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-08 00:46:23,868 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:23,868 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:23,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:23,874 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-08 00:46:23,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:23,884 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-08 00:46:23,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:24,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:24,019 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:24,058 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:24,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:24,064 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:24,102 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:24,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea0653b80> has no local changes
2024-11-08 00:46:24,109 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:24,117 [ scc.git] DEBUG [detached HEAD fcfab7f] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:24,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:24,118 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:24,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-08 00:46:24,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-08 00:46:25,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-08 00:46:25,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-08 00:46:26,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-08 00:46:26,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:27,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-08 00:46:27,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:27,740 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-08 00:46:27,740 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:27,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-08 00:46:27,741 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:27,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:27,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:27,752 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:27,752 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:27,757 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:27,762 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:27,763 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-08 00:46:28,299 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-08 00:46:28,300 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-08 00:46:28,305 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:28,305 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:28,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:28,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-08 00:46:28,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:28,325 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-08 00:46:28,336 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-08 00:46:28,337 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:28,340 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-08 00:46:28,340 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-08 00:46:28,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:28,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:28,506 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:28,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:28,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:28,550 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:28,557 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea06b6f40> has no local changes
2024-11-08 00:46:28,557 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:28,566 [ scc.git] DEBUG [detached HEAD e3b96cd] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:28,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:28,566 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:28,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-08 00:46:29,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-08 00:46:29,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-08 00:46:30,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-08 00:46:30,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:31,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-08 00:46:31,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:31,734 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-08 00:46:31,735 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:31,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-08 00:46:31,735 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:31,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:31,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:31,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:31,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:31,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:31,760 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:31,760 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-08 00:46:32,100 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-08 00:46:32,100 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-08 00:46:32,105 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:32,105 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:32,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:32,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-08 00:46:32,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:32,122 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-08 00:46:32,159 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-08 00:46:32,159 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-08 00:46:32,159 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-08 00:46:32,159 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-08 00:46:32,159 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-08 00:46:32,160 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-08 00:46:32,160 [ scc.git] DEBUG Auto-merging setup.py
2024-11-08 00:46:32,160 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-08 00:46:32,160 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:32,160 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:32,166 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-08 00:46:32,173 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-08 00:46:32,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:32,303 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-08 00:46:32,309 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-08 00:46:32,315 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-11-08 00:46:32,321 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:32,321 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-08 00:46:32,321 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:32,363 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:32,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:32,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:32,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:32,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea067a8b0> has no local changes
2024-11-08 00:46:32,418 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:32,426 [ scc.git] DEBUG [detached HEAD b9903df] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:32,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:32,427 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:32,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-08 00:46:33,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-08 00:46:33,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-08 00:46:34,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-08 00:46:34,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:35,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-08 00:46:35,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:35,578 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-08 00:46:35,579 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:35,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-08 00:46:35,579 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:35,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:35,587 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:35,593 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:35,593 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:35,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:35,607 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:35,607 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-08 00:46:36,080 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-08 00:46:36,080 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-08 00:46:36,085 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:36,085 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:36,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,091 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-08 00:46:36,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,104 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-11-08 00:46:36,117 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:36,120 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-08 00:46:36,120 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-08 00:46:36,120 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-08 00:46:36,120 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-08 00:46:36,120 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-08 00:46:36,122 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-08 00:46:36,123 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-08 00:46:36,123 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-08 00:46:36,124 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-08 00:46:36,125 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-08 00:46:36,125 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-08 00:46:36,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:36,254 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:36,298 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:36,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,304 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:36,346 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:36,355 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea060cb80> has no local changes
2024-11-08 00:46:36,356 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:36,367 [ scc.git] DEBUG [detached HEAD ef2f1bd] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:36,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:36,367 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:36,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-08 00:46:36,666 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:36,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-08 00:46:36,666 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:36,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:36,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:36,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:36,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:36,700 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:36,701 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:36,701 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:36,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:36,748 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:36,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:36,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:36,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:36,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea0606310> has no local changes
2024-11-08 00:46:36,803 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:36,811 [ scc.git] DEBUG [detached HEAD 65fa18e] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:36,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:36,812 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:37,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-11-08 00:46:37,070 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:37,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-08 00:46:37,070 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:37,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:37,077 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:37,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:37,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:37,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:37,098 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:37,098 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:37,098 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:37,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:37,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:37,146 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:37,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:37,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:37,195 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:37,202 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea063ce80> has no local changes
2024-11-08 00:46:37,202 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:37,212 [ scc.git] DEBUG [detached HEAD ff87fd2] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:37,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:37,212 [ scc.git] INFO Overriding base-branch from master to main
2024-11-08 00:46:37,213 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:37,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-08 00:46:38,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-08 00:46:38,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-08 00:46:38,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-08 00:46:39,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-08 00:46:39,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:40,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-08 00:46:40,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:40,754 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-08 00:46:40,754 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:40,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-08 00:46:40,754 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:40,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:40,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-08 00:46:40,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:40,766 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-08 00:46:40,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-08 00:46:40,777 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:40,777 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-08 00:46:41,226 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-08 00:46:41,226 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-08 00:46:41,230 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:41,230 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:41,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-08 00:46:41,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,246 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-08 00:46:41,256 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-08 00:46:41,256 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-08 00:46:41,256 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:41,256 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:41,262 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-08 00:46:41,268 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-08 00:46:41,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:41,410 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-08 00:46:41,416 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-08 00:46:41,423 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-08 00:46:41,428 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:41,428 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-08 00:46:41,428 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:41,468 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:41,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:41,511 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:41,519 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea0645fd0> has no local changes
2024-11-08 00:46:41,519 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:41,529 [ scc.git] DEBUG [detached HEAD 255e6c7] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:41,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:41,529 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:41,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-08 00:46:41,817 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:41,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-08 00:46:41,817 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:41,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:41,828 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:41,828 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:41,833 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:41,839 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:41,839 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:41,839 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:41,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,843 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:41,881 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:41,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:41,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:41,923 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:41,929 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea33fda30> has no local changes
2024-11-08 00:46:41,929 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:41,937 [ scc.git] DEBUG [detached HEAD 6aea61f] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:41,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:41,938 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:42,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-08 00:46:42,218 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:42,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-08 00:46:42,218 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:42,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:42,224 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:42,228 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:42,229 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:42,234 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:42,239 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:42,239 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:42,239 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:42,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:42,244 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:42,281 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:42,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:42,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:42,325 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:42,333 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea058b640> has no local changes
2024-11-08 00:46:42,333 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:42,342 [ scc.git] DEBUG [detached HEAD 22738b4] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:42,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:42,343 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:42,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-08 00:46:43,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-08 00:46:43,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-08 00:46:44,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-08 00:46:44,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:45,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-08 00:46:45,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:45,393 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-08 00:46:45,393 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:45,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-08 00:46:45,393 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:45,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:45,400 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-08 00:46:45,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:45,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-08 00:46:45,411 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-08 00:46:45,416 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:45,416 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-08 00:46:45,725 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-08 00:46:45,725 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-08 00:46:45,730 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:45,730 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:45,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:45,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-08 00:46:45,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:45,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-08 00:46:45,756 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-08 00:46:45,756 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-08 00:46:45,756 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:45,757 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:45,763 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-08 00:46:45,770 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-08 00:46:45,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:45,901 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-08 00:46:45,908 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-08 00:46:45,913 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-08 00:46:45,918 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:45,918 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-08 00:46:45,918 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:45,955 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:45,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:45,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:45,997 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:46,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea05e32e0> has no local changes
2024-11-08 00:46:46,004 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:46,012 [ scc.git] DEBUG [detached HEAD 013cfef] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:46,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:46,013 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-08 00:46:46,013 [ scc.repo] DEBUG ## PRs found:
2024-11-08 00:46:46,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-08 00:46:46,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-08 00:46:47,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-08 00:46:47,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-08 00:46:48,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:48,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-08 00:46:49,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-08 00:46:49,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:49,615 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-08 00:46:50,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-08 00:46:50,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-08 00:46:51,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-08 00:46:51,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-08 00:46:52,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-08 00:46:52,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-08 00:46:52,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-08 00:46:53,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-08 00:46:53,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-08 00:46:54,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-08 00:46:54,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-08 00:46:54,657 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-08 00:46:55,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-08 00:46:55,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-08 00:46:56,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-08 00:46:56,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-08 00:46:56,596 [ scc.repo] DEBUG ## Branches found:
2024-11-08 00:46:56,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-08 00:46:56,597 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:56,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:56,603 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-08 00:46:56,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-08 00:46:56,608 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-08 00:46:56,614 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-08 00:46:56,619 [ scc.git] DEBUG Already up to date.
2024-11-08 00:46:56,620 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-08 00:46:57,095 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-08 00:46:57,095 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-08 00:46:57,100 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-08 00:46:57,783 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-08 00:46:57,783 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-08 00:46:57,787 [ scc.git] DEBUG ## Unique users: []
2024-11-08 00:46:57,788 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:57,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:57,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-08 00:46:57,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:57,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-08 00:46:57,815 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-08 00:46:57,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-08 00:46:57,815 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-08 00:46:57,815 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-08 00:46:57,820 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-08 00:46:57,826 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-08 00:46:57,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:57,958 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-08 00:46:57,967 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-08 00:46:57,973 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#236](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-08 00:46:57,977 [ scc.config] DEBUG Found github.token
2024-11-08 00:46:57,977 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-08 00:46:57,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-08 00:46:57,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:57,987 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-08 00:46:58,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-08 00:46:58,007 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-08 00:46:58,007 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-08 00:46:58,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:58,340 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-08 00:46:58,379 [ scc.git] DEBUG Get sha1 of %s
2024-11-08 00:46:58,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-08 00:46:58,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:58,427 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:46:58,434 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea05ebe50> has no local changes
2024-11-08 00:46:58,435 [ 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#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:46:58,444 [ scc.git] DEBUG [detached HEAD baeca87] merge master -Dorg -Ssuccess-only
2024-11-08 00:46:58,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:46:58,444 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-08 00:46:58,517 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-08 00:46:58,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:58,731 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-08 00:46:58,735 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-08 00:46:59,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:59,270 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-08 00:46:59,274 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-08 00:46:59,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:46:59,653 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-08 00:46:59,657 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-08 00:47:00,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:00,035 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-08 00:47:00,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:00,414 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-08 00:47:00,418 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-08 00:47:00,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:00,798 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-08 00:47:00,802 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-08 00:47:01,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:01,190 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-08 00:47:01,194 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-08 00:47:01,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:01,573 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-08 00:47:01,577 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-08 00:47:01,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:01,973 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-08 00:47:01,978 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-08 00:47:02,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:02,364 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-08 00:47:02,368 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-08 00:47:02,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:02,748 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-08 00:47:02,752 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-08 00:47:03,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:03,141 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-08 00:47:03,146 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-08 00:47:03,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:03,527 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-08 00:47:03,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:03,908 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-08 00:47:04,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:04,283 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-08 00:47:04,287 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-08 00:47:04,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:04,678 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-08 00:47:05,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:05,071 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-08 00:47:05,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:05,448 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-08 00:47:05,453 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-08 00:47:05,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:05,840 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-08 00:47:05,844 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-08 00:47:06,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:06,238 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-08 00:47:06,243 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-08 00:47:06,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:06,632 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-08 00:47:06,637 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-08 00:47:07,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-08 00:47:07,030 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-08 00:47:07,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-08 00:47:07,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2ea102ca60> has local changes
2024-11-08 00:47:07,113 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
Conflicting PRs (not included):
- PR 595 Rdornier 'Rotate image panel by 90°'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
- PR 484 barrettMCW 'improved mirroring'
Conflicting PRs (not included):
- PR 488 will-moore 'Mobile layout'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Updating 3a505e4..d9953e4
Previously merged:
- PR 86 will-moore 'fix return of default favicon if not found'
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 90 jburel 'Update gha'
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 88 jburel 'Update gha'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#236 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/236/)'
2024-11-08 00:47:07,127 [ scc.git] DEBUG [detached HEAD 65d1679] merge master -Dorg -Ssuccess-only
2024-11-08 00:47:07,127 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-08 00:47:07,128 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-08 00:47:07,128 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-08 00:47:07,128 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-08 00:47:07,128 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-08 00:47:07,128 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-08 00:47:07,128 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-08 00:47:07,128 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-11-08 00:47:07,128 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,128 [ scc.merge] INFO
2024-11-08 00:47:07,128 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-08 00:47:07,129 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-08 00:47:07,129 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-08 00:47:07,129 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-08 00:47:07,129 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,129 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-08 00:47:07,129 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,129 [ scc.merge] INFO
2024-11-08 00:47:07,129 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-08 00:47:07,130 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-08 00:47:07,130 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-08 00:47:07,130 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-08 00:47:07,130 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-08 00:47:07,130 [ scc.merge] INFO Updating 3a505e4..d9953e4
2024-11-08 00:47:07,130 [ scc.merge] INFO Previously merged:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found'
2024-11-08 00:47:07,130 [ scc.merge] INFO
2024-11-08 00:47:07,130 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,130 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 90 jburel 'Update gha'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-08 00:47:07,131 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 88 jburel 'Update gha'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-08 00:47:07,131 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-08 00:47:07,131 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-08 00:47:07,131 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-08 00:47:07,131 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-08 00:47:07,131 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,131 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,131 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-08 00:47:07,131 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,132 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,132 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-08 00:47:07,132 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,132 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,132 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-08 00:47:07,132 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO
2024-11-08 00:47:07,132 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-08 00:47:07,133 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,133 [ scc.merge] INFO
2024-11-08 00:47:07,133 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-08 00:47:07,133 [ scc.merge] INFO
2024-11-08 00:47:07,133 [ scc.merge] INFO Repository: ome/scripts
2024-11-08 00:47:07,133 [ scc.merge] INFO Excluded PRs:
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-08 00:47:07,133 [ scc.merge] INFO Already up to date.
2024-11-08 00:47:07,133 [ scc.merge] INFO
2024-11-08 00:47:07,133 [ scc.merge] INFO Merged PRs:
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-08 00:47:07,133 [ scc.merge] INFO
2024-11-08 00:47:07,133 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-08 00:47:07,133 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-08 00:47:07,133 [ scc.merge] INFO
2024-11-08 00:47:07,133 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-08 00:47:07,133 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-08 00:47:07,140 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-08 00:47:07,146 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-08 00:47:07,152 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-08 00:47:07,157 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-08 00:47:07,162 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-08 00:47:07,168 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-08 00:47:07,174 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-08 00:47:07,180 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-08 00:47:07,189 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-08 00:47:07,197 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-08 00:47:07,204 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-08 00:47:07,210 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-08 00:47:07,217 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-08 00:47:07,222 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-08 00:47:07,228 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-08 00:47:07,235 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-08 00:47:07,241 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-08 00:47:07,247 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-08 00:47:07,253 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-08 00:47:07,259 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-08 00:47:07,264 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-08 00:47:07,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-08 00:47:07,270 [ scc.git] DEBUG Calling 'git remote'
2024-11-08 00:47:07,274 [ 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 19ebbbd] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 24444fe6
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 3a505e4
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from fc20959
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD fd7bf41] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-11-08 00:47:53,135 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-11-08 00:48:02,124 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-11-08 00:48:04,473 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-08 00:48:08,931 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-08 00:48:48,657 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
