Console Output
Skipping 113 KB..
Full Log] DEBUG Calling 'git fetch origin pull/111/head'
2024-10-26 00:43:01,213 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-10-26 00:43:01,213 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-10-26 00:43:01,218 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:43:01,218 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:01,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:01,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-10-26 00:43:01,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:01,234 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-10-26 00:43:01,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:01,248 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-10-26 00:43:01,248 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-10-26 00:43:01,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:01,377 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:43:01,416 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:01,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:01,423 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:43:01,460 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:43:01,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb09443370> has no local changes
2024-10-26 00:43:01,469 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:43:01,480 [ scc.git] DEBUG [detached HEAD 45a4079] merge master -Dorg -Ssuccess-only
2024-10-26 00:43:01,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:43:01,480 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:43:02,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-10-26 00:43:02,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488 HTTP/1.1" 200 None
2024-10-26 00:43:03,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 200 None
2024-10-26 00:43:03,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427 HTTP/1.1" 200 None
2024-10-26 00:43:04,051 [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-10-26 00:43:04,513 [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-10-26 00:43:05,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/767995856fdb93be4060423195f3f604aa6e4427 HTTP/1.1" 200 None
2024-10-26 00:43:05,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/767995856fdb93be4060423195f3f604aa6e4427?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:05,430 [ scc.repo] DEBUG - PR 488 will-moore 'Mobile layout'
2024-10-26 00:43:05,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/486 HTTP/1.1" 200 None
2024-10-26 00:43:06,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485 HTTP/1.1" 200 None
2024-10-26 00:43:06,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484 HTTP/1.1" 200 None
2024-10-26 00:43:07,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-10-26 00:43:07,242 [ scc.repo] DEBUG # ... Include label: include
2024-10-26 00:43:07,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-10-26 00:43:08,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:08,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:09,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81 HTTP/1.1" 200 None
2024-10-26 00:43:09,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/233e0442b0f738b5aeffd80bd4c7549ea9d5cc81?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:09,561 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-10-26 00:43:09,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-10-26 00:43:09,990 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:43:10,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-26 00:43:11,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:11,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:12,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-26 00:43:12,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:12,496 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-26 00:43:12,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-10-26 00:43:13,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-10-26 00:43:13,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-26 00:43:14,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:14,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:15,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-26 00:43:15,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:15,634 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-26 00:43:16,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-10-26 00:43:16,058 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:43:16,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-26 00:43:17,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:17,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:18,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-26 00:43:18,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:18,655 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-26 00:43:19,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-10-26 00:43:19,101 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:43:19,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-26 00:43:20,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:20,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:21,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-26 00:43:21,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:21,471 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-26 00:43:21,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-10-26 00:43:22,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-10-26 00:43:22,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-26 00:43:23,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:23,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:24,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-26 00:43:24,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:24,772 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-26 00:43:25,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-10-26 00:43:25,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-10-26 00:43:26,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-26 00:43:26,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:27,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:27,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-26 00:43:28,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:28,093 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-10-26 00:43:28,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-10-26 00:43:29,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-10-26 00:43:29,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-26 00:43:29,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:30,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-26 00:43:30,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:30,739 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-10-26 00:43:30,740 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:43:30,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-26 00:43:30,741 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:30,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:30,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:43:30,753 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:43:30,753 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:43:30,836 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:43:30,843 [ scc.git] DEBUG Already up to date.
2024-10-26 00:43:30,843 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-10-26 00:43:31,703 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:31,703 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-10-26 00:43:31,709 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-10-26 00:43:32,771 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:32,772 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-10-26 00:43:32,776 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-10-26 00:43:33,128 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:33,129 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-10-26 00:43:33,133 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-10-26 00:43:33,416 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:33,416 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-10-26 00:43:33,422 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-10-26 00:43:33,702 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:33,702 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-10-26 00:43:33,707 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-10-26 00:43:34,191 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:34,191 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-10-26 00:43:34,196 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-10-26 00:43:34,475 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:34,475 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-10-26 00:43:34,480 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-10-26 00:43:34,946 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:34,946 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-10-26 00:43:34,952 [ scc.git] DEBUG Calling 'git fetch origin pull/488/head'
2024-10-26 00:43:35,410 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-26 00:43:35,410 [ scc.git] DEBUG * branch refs/pull/488/head -> FETCH_HEAD
2024-10-26 00:43:35,416 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:43:35,416 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:35,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:35,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-26 00:43:35,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:35,437 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-26 00:43:35,449 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-26 00:43:35,451 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:35,454 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-10-26 00:43:35,454 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-10-26 00:43:35,454 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-10-26 00:43:35,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:35,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-26 00:43:35,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:35,606 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-26 00:43:35,714 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-10-26 00:43:35,714 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-26 00:43:35,714 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-26 00:43:35,714 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-10-26 00:43:35,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:35,719 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-10-26 00:43:35,719 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-10-26 00:43:35,719 [ scc.git] DEBUG src/app/header.html | 5 +
2024-10-26 00:43:35,719 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-10-26 00:43:35,719 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-10-26 00:43:35,719 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-10-26 00:43:35,719 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-10-26 00:43:35,719 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-10-26 00:43:35,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:35,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-26 00:43:35,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:35,982 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-26 00:43:36,088 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-10-26 00:43:36,089 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:36,092 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-10-26 00:43:36,092 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-10-26 00:43:36,092 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-10-26 00:43:36,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:36,344 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-26 00:43:36,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:36,403 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-26 00:43:36,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:36,428 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-10-26 00:43:36,428 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-10-26 00:43:36,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:36,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-10-26 00:43:36,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:36,743 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-10-26 00:43:36,786 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-26 00:43:36,787 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:37,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:37,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-10-26 00:43:37,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:37,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-10-26 00:43:37,223 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-26 00:43:37,224 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-26 00:43:37,224 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-26 00:43:37,224 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-10-26 00:43:37,229 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-10-26 00:43:37,229 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-10-26 00:43:37,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:37,494 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-10-26 00:43:37,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:37,516 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-10-26 00:43:37,608 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-26 00:43:37,609 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:37,619 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-10-26 00:43:37,619 [ scc.git] DEBUG package.json | 2 +-
2024-10-26 00:43:37,619 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-10-26 00:43:37,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:37,868 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-10-26 00:43:37,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:37,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 233e0442b0f738b5aeffd80bd4c7549ea9d5cc81'
2024-10-26 00:43:38,145 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:38,148 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-10-26 00:43:38,148 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-10-26 00:43:38,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:38,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...767995856fdb93be4060423195f3f604aa6e4427'
2024-10-26 00:43:38,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:38,303 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 488 (Mobile layout) 767995856fdb93be4060423195f3f604aa6e4427'
2024-10-26 00:43:38,351 [ scc.git] DEBUG Auto-merging src/utils/ui.js
2024-10-26 00:43:38,352 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/utils/ui.js
2024-10-26 00:43:38,352 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:43:38,352 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:43:38,359 [ scc.git] DEBUG Calling 'git reset --hard 9b59b18052c92ab0eda5ec3969d4fafe2251a35b'
2024-10-26 00:43:38,368 [ scc.git] DEBUG HEAD is now at 9b59b18 merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring)
2024-10-26 00:43:38,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:38,688 [ scc.git] DEBUG Calling 'git merge-base a8f380fabfd839b946e5a5f613f1fce07abb3815 767995856fdb93be4060423195f3f604aa6e4427'
2024-10-26 00:43:38,695 [ scc.git] DEBUG Calling 'git diff --name-only a8f380fabfd839b946e5a5f613f1fce07abb3815..a8f380fabfd839b946e5a5f613f1fce07abb3815'
2024-10-26 00:43:38,701 [ scc.git] INFO - PR 488 will-moore 'Mobile layout'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- PR #482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- src/utils/ui.js
--conflicts
2024-10-26 00:43:38,707 [ scc.config] DEBUG Found github.token
2024-10-26 00:43:38,707 [ scc.git] DEBUG Adding comment to issue #488.
2024-10-26 00:43:39,440 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/488/comments HTTP/1.1" 201 2037
2024-10-26 00:43:39,441 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:43:39,483 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:39,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:39,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:43:39,525 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:43:39,532 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb0a466eb0> has no local changes
2024-10-26 00:43:39,533 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:43:39,541 [ scc.git] DEBUG [detached HEAD 809e399] merge master -Dorg -Ssuccess-only
2024-10-26 00:43:39,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:43:39,542 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:43:39,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-10-26 00:43:40,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/87 HTTP/1.1" 200 None
2024-10-26 00:43:40,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/87/comments HTTP/1.1" 200 None
2024-10-26 00:43:41,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a HTTP/1.1" 200 None
2024-10-26 00:43:41,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:42,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c9642f31154cd66dd416599d485409543b18618a/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:42,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-10-26 00:43:43,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-10-26 00:43:43,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b HTTP/1.1" 200 None
2024-10-26 00:43:44,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:44,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:43:45,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-10-26 00:43:45,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-10-26 00:43:46,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-26 00:43:46,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:47,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-26 00:43:47,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:47,491 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-10-26 00:43:47,492 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:43:47,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-26 00:43:47,492 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:47,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:47,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:43:47,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:43:47,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:43:47,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:43:47,515 [ scc.git] DEBUG Already up to date.
2024-10-26 00:43:47,515 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-10-26 00:43:47,835 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-10-26 00:43:47,835 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-10-26 00:43:47,839 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:43:47,839 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:47,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:47,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-26 00:43:47,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:47,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-26 00:43:47,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:47,868 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-10-26 00:43:47,868 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-10-26 00:43:47,868 [ scc.git] DEBUG requirements.txt | 2 +-
2024-10-26 00:43:47,868 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-10-26 00:43:47,868 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-10-26 00:43:47,868 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-10-26 00:43:48,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:48,003 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:43:48,045 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:48,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:48,052 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:43:48,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:43:48,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb09438370> has no local changes
2024-10-26 00:43:48,107 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 87 will-moore 'Tests dont use omero utils' (status: failure)
- PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:43:48,118 [ scc.git] DEBUG [detached HEAD 5aebe23] merge master -Dorg -Ssuccess-only
2024-10-26 00:43:48,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:43:48,119 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:43:48,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-10-26 00:43:49,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-10-26 00:43:49,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-10-26 00:43:50,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-26 00:43:50,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:51,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-26 00:43:51,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:51,404 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-10-26 00:43:51,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-10-26 00:43:52,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-10-26 00:43:52,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-26 00:43:53,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:53,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-26 00:43:54,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:54,153 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-26 00:43:54,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-10-26 00:43:55,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-10-26 00:43:55,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-26 00:43:55,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:43:56,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-26 00:43:56,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:43:56,873 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-26 00:43:56,873 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:43:56,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-26 00:43:56,874 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:56,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:56,881 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:43:56,886 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:43:56,886 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:43:56,891 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:43:56,897 [ scc.git] DEBUG Already up to date.
2024-10-26 00:43:56,897 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-10-26 00:43:57,631 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-26 00:43:57,631 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-10-26 00:43:57,636 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-10-26 00:43:58,168 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-26 00:43:58,169 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-10-26 00:43:58,174 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-10-26 00:43:58,456 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-26 00:43:58,457 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-10-26 00:43:58,461 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:43:58,461 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:58,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:58,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-26 00:43:58,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:58,488 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-26 00:43:58,592 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-10-26 00:43:58,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-10-26 00:43:58,593 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-26 00:43:58,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-26 00:43:58,593 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:43:58,593 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:43:58,600 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-26 00:43:58,607 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-26 00:43:58,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:58,736 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-26 00:43:58,744 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-26 00:43:58,751 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-10-26 00:43:58,757 [ scc.config] DEBUG Found github.token
2024-10-26 00:43:58,757 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-10-26 00:43:58,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-26 00:43:58,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:58,770 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-26 00:43:58,790 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-26 00:43:58,790 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-26 00:43:58,790 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-10-26 00:43:58,790 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:43:58,791 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:43:58,797 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-26 00:43:58,805 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-26 00:43:59,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:59,122 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-26 00:43:59,130 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-26 00:43:59,136 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-10-26 00:43:59,142 [ scc.config] DEBUG Found github.token
2024-10-26 00:43:59,142 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-10-26 00:43:59,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-26 00:43:59,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:59,153 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-26 00:43:59,214 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:43:59,217 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-10-26 00:43:59,217 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-10-26 00:43:59,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:43:59,499 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:43:59,539 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:43:59,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:43:59,545 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:43:59,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:43:59,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb09415ee0> has no local changes
2024-10-26 00:43:59,592 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:43:59,601 [ scc.git] DEBUG [detached HEAD d16edb2] merge master -Dorg -Ssuccess-only
2024-10-26 00:43:59,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:43:59,602 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:00,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-10-26 00:44:00,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-10-26 00:44:00,508 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:44:01,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-26 00:44:01,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:02,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:44:02,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-26 00:44:03,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:03,137 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-26 00:44:03,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-10-26 00:44:03,592 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:44:04,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-26 00:44:04,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:05,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:44:05,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-26 00:44:06,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:06,186 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-26 00:44:06,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-10-26 00:44:06,638 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-26 00:44:07,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-26 00:44:07,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:08,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:44:08,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-26 00:44:08,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:08,955 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-26 00:44:09,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-10-26 00:44:09,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-10-26 00:44:10,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-10-26 00:44:10,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-10-26 00:44:11,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-10-26 00:44:11,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-10-26 00:44:11,812 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:11,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-26 00:44:11,812 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:11,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:11,819 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:11,825 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:11,825 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:11,831 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:11,838 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:11,838 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-10-26 00:44:12,156 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-26 00:44:12,156 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-10-26 00:44:12,161 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-10-26 00:44:12,499 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-26 00:44:12,499 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-10-26 00:44:12,503 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-10-26 00:44:12,785 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-26 00:44:12,785 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-10-26 00:44:12,790 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:12,791 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:12,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:12,796 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-10-26 00:44:12,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:12,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-10-26 00:44:12,815 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:12,818 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-10-26 00:44:12,818 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-10-26 00:44:12,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:12,950 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-10-26 00:44:12,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:12,961 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-10-26 00:44:13,043 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-26 00:44:13,044 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:13,047 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-10-26 00:44:13,047 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-10-26 00:44:13,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:13,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-10-26 00:44:13,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:13,338 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-10-26 00:44:13,349 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-26 00:44:13,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:13,353 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-10-26 00:44:13,353 [ scc.git] DEBUG package.json | 2 +-
2024-10-26 00:44:13,353 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-10-26 00:44:13,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:13,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:13,747 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:13,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:13,753 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:13,792 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:13,799 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb09435be0> has no local changes
2024-10-26 00:44:13,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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:13,809 [ scc.git] DEBUG [detached HEAD f6d1828] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:13,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:13,810 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:14,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-10-26 00:44:14,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-10-26 00:44:15,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-26 00:44:15,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:16,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-26 00:44:16,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:16,714 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-10-26 00:44:16,714 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:16,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-26 00:44:16,714 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:16,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:16,720 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:16,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:16,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:16,732 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:16,739 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:16,739 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-26 00:44:17,081 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-10-26 00:44:17,081 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-26 00:44:17,086 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:17,086 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:17,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:17,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-26 00:44:17,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:17,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-26 00:44:17,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:17,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:17,293 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:17,333 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:17,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:17,340 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:17,379 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:17,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb0840efa0> has no local changes
2024-10-26 00:44:17,385 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:17,393 [ scc.git] DEBUG [detached HEAD 6f1bc98] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:17,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:17,394 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:17,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-10-26 00:44:18,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-10-26 00:44:18,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-10-26 00:44:19,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-10-26 00:44:19,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-26 00:44:20,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:20,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-26 00:44:20,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:20,918 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-26 00:44:20,918 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:20,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-26 00:44:20,918 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:20,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:20,925 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:20,930 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:20,930 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:20,936 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:20,942 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:20,942 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-10-26 00:44:21,467 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-10-26 00:44:21,467 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-10-26 00:44:21,472 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:21,472 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:21,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:21,478 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-10-26 00:44:21,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:21,491 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-10-26 00:44:21,502 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-10-26 00:44:21,503 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:21,505 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-10-26 00:44:21,505 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-10-26 00:44:21,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:21,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:21,701 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:21,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:21,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:21,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:21,758 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb083f5c70> has no local changes
2024-10-26 00:44:21,758 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:21,767 [ scc.git] DEBUG [detached HEAD 343592c] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:21,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:21,768 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:22,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-10-26 00:44:22,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-10-26 00:44:23,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-10-26 00:44:23,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-26 00:44:23,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:24,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-26 00:44:24,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:24,902 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-26 00:44:24,902 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:24,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-26 00:44:24,903 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:24,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:24,909 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:24,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:24,915 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:24,921 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:24,926 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:24,927 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-26 00:44:25,398 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-10-26 00:44:25,398 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-26 00:44:25,403 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:25,403 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:25,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:25,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-26 00:44:25,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:25,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-26 00:44:25,590 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG Auto-merging setup.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-10-26 00:44:25,591 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:44:25,591 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:44:25,597 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-26 00:44:25,604 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-10-26 00:44:25,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:25,739 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-26 00:44:25,749 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-26 00:44:25,756 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-10-26 00:44:25,762 [ scc.config] DEBUG Found github.token
2024-10-26 00:44:25,762 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-10-26 00:44:25,763 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:25,806 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:25,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:25,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:25,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:25,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb083fbfd0> has no local changes
2024-10-26 00:44:25,864 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:25,879 [ scc.git] DEBUG [detached HEAD 489d654] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:25,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:25,880 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:26,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-10-26 00:44:26,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-10-26 00:44:27,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-10-26 00:44:27,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-26 00:44:28,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:28,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-26 00:44:28,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:28,959 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-26 00:44:28,960 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:28,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-26 00:44:28,960 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:28,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:28,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:28,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:28,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:28,978 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:28,985 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:28,985 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-10-26 00:44:29,871 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-10-26 00:44:29,872 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-10-26 00:44:29,876 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:29,877 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:29,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:29,882 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-10-26 00:44:29,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:29,893 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-10-26 00:44:29,909 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-10-26 00:44:29,912 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-10-26 00:44:29,914 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-10-26 00:44:29,915 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-10-26 00:44:29,915 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-10-26 00:44:29,915 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-10-26 00:44:29,915 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-10-26 00:44:29,915 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-10-26 00:44:30,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:30,045 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:30,087 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,094 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:30,135 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:30,142 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb0840e5b0> has no local changes
2024-10-26 00:44:30,142 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:30,151 [ scc.git] DEBUG [detached HEAD 2a0d1ec] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:30,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:30,152 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:30,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-10-26 00:44:30,439 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:30,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-26 00:44:30,439 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:30,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:30,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:30,458 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:30,464 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:30,464 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:30,464 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,469 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:30,506 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:30,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:30,558 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb083c72e0> has no local changes
2024-10-26 00:44:30,558 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:30,567 [ scc.git] DEBUG [detached HEAD a9d9f2b] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:30,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:30,568 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:30,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-10-26 00:44:30,849 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:30,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-26 00:44:30,849 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,856 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:30,862 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:30,862 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:30,868 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:30,874 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:30,874 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:30,875 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,879 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:30,920 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:30,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:30,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:30,966 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:30,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb08370100> has no local changes
2024-10-26 00:44:30,974 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:30,982 [ scc.git] DEBUG [detached HEAD 7b52ac5] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:30,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:30,983 [ scc.git] INFO Overriding base-branch from master to main
2024-10-26 00:44:30,983 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:31,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-10-26 00:44:31,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-10-26 00:44:32,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-10-26 00:44:32,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-10-26 00:44:33,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-26 00:44:33,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:34,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-26 00:44:34,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:34,493 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-26 00:44:34,493 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:34,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-26 00:44:34,493 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:34,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:34,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-10-26 00:44:34,505 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:34,505 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-10-26 00:44:34,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-10-26 00:44:34,518 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:34,518 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-10-26 00:44:34,934 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-10-26 00:44:34,934 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-10-26 00:44:34,938 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:34,939 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:34,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:34,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-26 00:44:34,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:34,954 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-26 00:44:34,962 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-10-26 00:44:34,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-10-26 00:44:34,963 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:44:34,963 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:44:34,968 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-26 00:44:34,975 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-10-26 00:44:35,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:35,108 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-26 00:44:35,114 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-26 00:44:35,119 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-10-26 00:44:35,124 [ scc.config] DEBUG Found github.token
2024-10-26 00:44:35,124 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-10-26 00:44:35,124 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:35,162 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:35,205 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:35,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb083c3eb0> has no local changes
2024-10-26 00:44:35,211 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:35,219 [ scc.git] DEBUG [detached HEAD bfacba6] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:35,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:35,219 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:35,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-10-26 00:44:35,514 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:35,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-26 00:44:35,514 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,521 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:35,527 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:35,527 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:35,533 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:35,539 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:35,539 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:35,539 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,545 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:35,587 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,593 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:35,634 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:35,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb08370b80> has no local changes
2024-10-26 00:44:35,641 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:35,650 [ scc.git] DEBUG [detached HEAD 8ff5e05] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:35,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:35,651 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:35,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-10-26 00:44:35,909 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:35,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-26 00:44:35,910 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,915 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:35,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:35,921 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:35,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:35,934 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:35,934 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:35,934 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,939 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:35,975 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:35,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:35,981 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:36,017 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:36,024 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb0837be80> has no local changes
2024-10-26 00:44:36,024 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:36,032 [ scc.git] DEBUG [detached HEAD 6c3967e] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:36,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:36,032 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:36,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-10-26 00:44:36,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-10-26 00:44:37,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-10-26 00:44:37,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-26 00:44:38,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:38,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-26 00:44:39,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:39,062 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-10-26 00:44:39,062 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:39,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-26 00:44:39,062 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:39,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:39,069 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-26 00:44:39,074 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:39,074 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-26 00:44:39,080 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-26 00:44:39,085 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:39,085 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-10-26 00:44:39,534 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-10-26 00:44:39,534 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-10-26 00:44:39,539 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:39,539 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:39,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:39,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-26 00:44:39,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:39,557 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-26 00:44:39,569 [ scc.git] DEBUG Auto-merging Dockerfile
2024-10-26 00:44:39,569 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-10-26 00:44:39,569 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:44:39,569 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:44:39,576 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-26 00:44:39,584 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-10-26 00:44:39,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:39,715 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-26 00:44:39,722 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-26 00:44:39,727 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-10-26 00:44:39,732 [ scc.config] DEBUG Found github.token
2024-10-26 00:44:39,732 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-10-26 00:44:39,732 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:39,770 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:39,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:39,777 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:39,815 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:39,823 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb08371fd0> has no local changes
2024-10-26 00:44:39,823 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:39,834 [ scc.git] DEBUG [detached HEAD 34b1a22] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:39,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:39,835 [ scc.git] INFO Overriding base-branch from master to develop
2024-10-26 00:44:39,835 [ scc.repo] DEBUG ## PRs found:
2024-10-26 00:44:40,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-10-26 00:44:40,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-10-26 00:44:41,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-10-26 00:44:41,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-26 00:44:42,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:42,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-26 00:44:43,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-26 00:44:43,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:43,414 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-26 00:44:43,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-10-26 00:44:44,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-10-26 00:44:45,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-10-26 00:44:45,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-10-26 00:44:45,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-10-26 00:44:46,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-10-26 00:44:46,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-26 00:44:47,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-26 00:44:47,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-26 00:44:48,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-10-26 00:44:48,114 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-26 00:44:48,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-10-26 00:44:49,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-10-26 00:44:49,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-10-26 00:44:49,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-10-26 00:44:49,946 [ scc.repo] DEBUG ## Branches found:
2024-10-26 00:44:49,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-26 00:44:49,946 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:49,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:49,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-10-26 00:44:49,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-26 00:44:49,958 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-10-26 00:44:49,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-10-26 00:44:49,968 [ scc.git] DEBUG Already up to date.
2024-10-26 00:44:49,968 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-10-26 00:44:50,456 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-26 00:44:50,456 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-10-26 00:44:50,464 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-10-26 00:44:50,921 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-26 00:44:50,922 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-10-26 00:44:50,926 [ scc.git] DEBUG ## Unique users: []
2024-10-26 00:44:50,926 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:50,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:50,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-26 00:44:50,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:50,948 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-26 00:44:50,984 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-10-26 00:44:50,984 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-10-26 00:44:50,984 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-26 00:44:50,985 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-26 00:44:50,991 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-26 00:44:50,998 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-26 00:44:51,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:51,134 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-26 00:44:51,141 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-26 00:44:51,147 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#224](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-10-26 00:44:51,152 [ scc.config] DEBUG Found github.token
2024-10-26 00:44:51,152 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-10-26 00:44:51,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-26 00:44:51,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:51,162 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-26 00:44:51,184 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-26 00:44:51,187 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-10-26 00:44:51,187 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-10-26 00:44:51,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:51,516 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-26 00:44:51,561 [ scc.git] DEBUG Get sha1 of %s
2024-10-26 00:44:51,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-26 00:44:51,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:51,606 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:44:51,614 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb08351520> has no local changes
2024-10-26 00:44:51,614 [ 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#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:44:51,623 [ scc.git] DEBUG [detached HEAD a243f75] merge master -Dorg -Ssuccess-only
2024-10-26 00:44:51,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:44:51,624 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-26 00:44:51,711 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-10-26 00:44:51,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:51,930 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-10-26 00:44:51,935 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-10-26 00:44:52,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:52,314 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-10-26 00:44:52,319 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-10-26 00:44:52,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:52,691 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-10-26 00:44:52,696 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-10-26 00:44:53,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:53,082 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-10-26 00:44:53,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:53,448 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-10-26 00:44:53,452 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-10-26 00:44:53,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:53,830 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-10-26 00:44:53,835 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-10-26 00:44:54,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:54,330 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-10-26 00:44:54,334 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-10-26 00:44:54,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:54,716 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-10-26 00:44:54,721 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-10-26 00:44:55,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:55,101 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-10-26 00:44:55,107 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-10-26 00:44:55,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:55,510 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-10-26 00:44:55,515 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-10-26 00:44:55,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:55,893 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-10-26 00:44:55,898 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-10-26 00:44:56,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:56,273 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-10-26 00:44:56,279 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-10-26 00:44:56,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:56,666 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-10-26 00:44:57,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:57,058 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-10-26 00:44:57,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:57,436 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-10-26 00:44:57,440 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-10-26 00:44:57,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:57,822 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-10-26 00:44:58,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:58,202 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-10-26 00:44:58,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:58,580 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-10-26 00:44:58,585 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-10-26 00:44:58,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:58,971 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-10-26 00:44:58,977 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-10-26 00:44:59,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:59,394 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-10-26 00:44:59,399 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-10-26 00:44:59,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:44:59,771 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-10-26 00:44:59,775 [ scc.config] DEBUG Found submodule.scripts.url
2024-10-26 00:45:00,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-26 00:45:00,153 [ scc.config] DEBUG Found submodule.scripts.branch
2024-10-26 00:45:00,153 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-26 00:45:00,242 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb0b7c88b0> has local changes
2024-10-26 00:45:00,243 [ 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 87 will-moore 'Tests dont use omero utils' (status: failure)
- PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#224 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/224/)'
2024-10-26 00:45:00,259 [ scc.git] DEBUG [detached HEAD 395fb65] merge master -Dorg -Ssuccess-only
2024-10-26 00:45:00,259 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-10-26 00:45:00,259 [ scc.merge] INFO Repository: ome/omero-plugins
2024-10-26 00:45:00,259 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,259 [ scc.merge] INFO
2024-10-26 00:45:00,259 [ scc.merge] INFO
2024-10-26 00:45:00,259 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-10-26 00:45:00,259 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,259 [ scc.merge] INFO
2024-10-26 00:45:00,259 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-10-26 00:45:00,260 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-10-26 00:45:00,260 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-10-26 00:45:00,260 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-10-26 00:45:00,260 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-10-26 00:45:00,260 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-26 00:45:00,260 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,260 [ scc.merge] INFO Repository: ome/omero-figure
2024-10-26 00:45:00,260 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-10-26 00:45:00,260 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-10-26 00:45:00,260 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,260 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-10-26 00:45:00,261 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Repository: ome/omero-gallery
2024-10-26 00:45:00,261 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-10-26 00:45:00,261 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-10-26 00:45:00,261 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,261 [ scc.merge] INFO
2024-10-26 00:45:00,261 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-26 00:45:00,261 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 488 will-moore 'Mobile layout'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Repository: ome/omero-mapr
2024-10-26 00:45:00,262 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 87 will-moore 'Tests dont use omero utils' (status: failure)
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-10-26 00:45:00,262 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Repository: ome/omero-metadata
2024-10-26 00:45:00,262 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Repository: ome/omero-parade
2024-10-26 00:45:00,262 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-10-26 00:45:00,262 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-10-26 00:45:00,262 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,262 [ scc.merge] INFO
2024-10-26 00:45:00,262 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,262 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: ome/omero-rois
2024-10-26 00:45:00,263 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: ome/omero-signup
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: ome/omero-upload
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-10-26 00:45:00,263 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,263 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-10-26 00:45:00,263 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,263 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-10-26 00:45:00,264 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-10-26 00:45:00,264 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Repository: ome/scripts
2024-10-26 00:45:00,264 [ scc.merge] INFO Excluded PRs:
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-10-26 00:45:00,264 [ scc.merge] INFO Already up to date.
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Merged PRs:
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-26 00:45:00,264 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-26 00:45:00,264 [ scc.merge] INFO
2024-10-26 00:45:00,264 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-26 00:45:00,264 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-10-26 00:45:00,270 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-10-26 00:45:00,275 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-10-26 00:45:00,280 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-10-26 00:45:00,285 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-10-26 00:45:00,289 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-10-26 00:45:00,294 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-26 00:45:00,299 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-26 00:45:00,303 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-26 00:45:00,311 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-26 00:45:00,316 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-26 00:45:00,321 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-26 00:45:00,326 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-26 00:45:00,331 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-26 00:45:00,335 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-26 00:45:00,340 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-26 00:45:00,345 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-26 00:45:00,349 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-26 00:45:00,354 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-26 00:45:00,359 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-26 00:45:00,364 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-26 00:45:00,369 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-26 00:45:00,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-26 00:45:00,375 [ scc.git] DEBUG Calling 'git remote'
2024-10-26 00:45:00,382 [ 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 98f1c10] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 24444fe6
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 6d5a095] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-10-26 00:45:46,813 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-10-26 00:45:55,409 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-10-26 00:45:57,635 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-10-26 00:46:02,006 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-10-26 00:46:40,746 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9e710227/images/svgs/logo.svg){kind=logo}
