Console Output
Skipping 105 KB..
Full Loges/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-10-07 00:46:26,591 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-10-07 00:46:26,591 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:46:26,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-10-07 00:46:26,591 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:26,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:26,596 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:46:26,602 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:46:26,602 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:46:26,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:46:26,612 [ scc.git] DEBUG Already up to date.
2024-10-07 00:46:26,613 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-10-07 00:46:26,955 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-10-07 00:46:26,955 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-10-07 00:46:26,960 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:46:26,960 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:26,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:26,965 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-10-07 00:46:26,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:26,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-10-07 00:46:27,015 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-10-07 00:46:27,015 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:46:27,018 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-10-07 00:46:27,018 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-10-07 00:46:27,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:46:27,148 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:46:27,188 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:27,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:27,193 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:46:27,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:46:27,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3eab7499d0> has no local changes
2024-10-07 00:46:27,238 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:46:27,267 [ scc.git] DEBUG [detached HEAD 7873f6f] merge master -Dorg -Ssuccess-only
2024-10-07 00:46:27,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:46:27,268 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:46:27,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-10-07 00:46:28,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-10-07 00:46:28,041 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:46:28,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-10-07 00:46:29,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-07 00:46:29,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-07 00:46:30,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-10-07 00:46:30,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-10-07 00:46:30,612 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-07 00:46:30,612 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:46:30,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-07 00:46:30,612 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:30,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:30,618 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:46:30,623 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:46:30,623 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:46:30,628 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:46:30,634 [ scc.git] DEBUG Already up to date.
2024-10-07 00:46:30,634 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-10-07 00:46:30,947 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-10-07 00:46:30,947 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-10-07 00:46:30,952 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:46:30,952 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:30,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:30,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-10-07 00:46:30,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:30,967 [ 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-07 00:46:30,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:46:30,981 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-10-07 00:46:30,982 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-10-07 00:46:31,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:46:31,116 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:46:31,157 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:31,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:31,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:46:31,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:46:31,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea96faf10> has no local changes
2024-10-07 00:46:31,210 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:46:31,240 [ scc.git] DEBUG [detached HEAD 6b02ea0] merge master -Dorg -Ssuccess-only
2024-10-07 00:46:31,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:46:31,241 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:46:31,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-10-07 00:46:32,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484 HTTP/1.1" 200 None
2024-10-07 00:46:32,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-10-07 00:46:32,708 [ scc.repo] DEBUG # ... Include label: include
2024-10-07 00:46:33,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05 HTTP/1.1" 200 None
2024-10-07 00:46:33,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-10-07 00:46:34,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-10-07 00:46:34,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05 HTTP/1.1" 200 None
2024-10-07 00:46:34,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/68b90aebf749c074bde218ba36d3ce662068cd05?per_page=1 HTTP/1.1" 200 2
2024-10-07 00:46:34,902 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-10-07 00:46:35,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-10-07 00:46:35,331 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:46:35,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-07 00:46:36,374 [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-07 00:46:36,850 [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-07 00:46:37,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-07 00:46:37,679 [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-07 00:46:37,680 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-07 00:46:38,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-10-07 00:46:38,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-10-07 00:46:39,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-07 00:46:39,587 [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-07 00:46:40,094 [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-07 00:46:40,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-07 00:46:40,971 [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-07 00:46:40,972 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-07 00:46:41,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-10-07 00:46:41,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-10-07 00:46:41,894 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:46:42,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-07 00:46:42,995 [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-07 00:46:43,465 [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-07 00:46:44,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-07 00:46:44,408 [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-07 00:46:44,408 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-07 00:46:44,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-10-07 00:46:44,855 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:46:45,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-07 00:46:45,901 [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-07 00:46:46,383 [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-07 00:46:46,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-07 00:46:47,187 [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-07 00:46:47,187 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-07 00:46:47,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-10-07 00:46:48,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-10-07 00:46:48,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-07 00:46:48,995 [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-07 00:46:49,504 [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-07 00:46:49,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-07 00:46:50,330 [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-07 00:46:50,331 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-07 00:46:50,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-10-07 00:46:51,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-10-07 00:46:51,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-07 00:46:52,177 [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-07 00:46:52,705 [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-07 00:46:53,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-07 00:46:53,592 [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-07 00:46:53,593 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-10-07 00:46:54,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-10-07 00:46:54,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-10-07 00:46:54,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-07 00:46:55,418 [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-07 00:46:55,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-07 00:46:56,305 [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-07 00:46:56,306 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-10-07 00:46:56,307 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:46:56,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-07 00:46:56,307 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:46:56,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:46:56,313 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:46:56,318 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:46:56,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:46:56,466 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:46:56,473 [ scc.git] DEBUG Already up to date.
2024-10-07 00:46:56,473 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-10-07 00:46:57,509 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:46:57,510 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-10-07 00:46:57,515 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-10-07 00:46:59,257 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:46:59,258 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-10-07 00:46:59,262 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-10-07 00:46:59,733 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:46:59,734 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-10-07 00:46:59,738 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-10-07 00:47:00,042 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:47:00,043 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-10-07 00:47:00,047 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-10-07 00:47:00,321 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:47:00,321 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-10-07 00:47:00,326 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-10-07 00:47:00,769 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:47:00,769 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-10-07 00:47:00,774 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-10-07 00:47:01,061 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:47:01,061 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-10-07 00:47:01,066 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-10-07 00:47:01,860 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-07 00:47:01,860 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-10-07 00:47:01,865 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:01,865 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:01,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:01,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-07 00:47:01,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:01,888 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-07 00:47:02,034 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-07 00:47:02,109 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:02,114 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-10-07 00:47:02,114 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-10-07 00:47:02,114 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-10-07 00:47:02,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:02,242 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-07 00:47:02,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:02,255 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-07 00:47:02,654 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-10-07 00:47:02,654 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-07 00:47:02,654 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-07 00:47:02,654 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-10-07 00:47:02,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:02,659 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-10-07 00:47:02,659 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-10-07 00:47:02,659 [ scc.git] DEBUG src/app/header.html | 5 +
2024-10-07 00:47:02,659 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-10-07 00:47:02,659 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-10-07 00:47:02,659 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-10-07 00:47:02,659 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-10-07 00:47:02,659 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-10-07 00:47:02,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:02,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-07 00:47:02,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:02,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-07 00:47:02,962 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-10-07 00:47:02,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:02,967 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-10-07 00:47:02,967 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-10-07 00:47:02,967 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-10-07 00:47:03,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:03,171 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-07 00:47:03,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:03,207 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-07 00:47:03,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:03,289 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-10-07 00:47:03,289 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-10-07 00:47:03,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:03,551 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-10-07 00:47:03,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:03,572 [ 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-07 00:47:03,702 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-07 00:47:03,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:03,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:03,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-10-07 00:47:03,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:03,943 [ 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-07 00:47:04,228 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-07 00:47:04,229 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-07 00:47:04,229 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-07 00:47:04,246 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:04,250 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-10-07 00:47:04,250 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-10-07 00:47:04,251 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-10-07 00:47:04,251 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-10-07 00:47:04,251 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-10-07 00:47:04,251 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-10-07 00:47:04,251 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-10-07 00:47:04,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:04,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-10-07 00:47:04,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:04,436 [ 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-07 00:47:04,572 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-07 00:47:04,585 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:04,595 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-10-07 00:47:04,596 [ scc.git] DEBUG package.json | 2 +-
2024-10-07 00:47:04,596 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-10-07 00:47:04,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:04,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...68b90aebf749c074bde218ba36d3ce662068cd05'
2024-10-07 00:47:04,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:04,805 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 68b90aebf749c074bde218ba36d3ce662068cd05'
2024-10-07 00:47:04,874 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:04,877 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-10-07 00:47:04,877 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-10-07 00:47:05,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:05,172 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:05,216 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:05,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:05,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:05,260 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:05,270 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea96fd8e0> has no local changes
2024-10-07 00:47:05,270 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.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'
Generated by OMERO-plugins-push#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:05,278 [ scc.git] DEBUG [detached HEAD 07f9c2e] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:05,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:05,279 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:05,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-10-07 00:47:06,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-10-07 00:47:06,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-10-07 00:47:07,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b HTTP/1.1" 200 None
2024-10-07 00:47:07,505 [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-07 00:47:07,952 [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-07 00:47:08,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-10-07 00:47:08,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-10-07 00:47:09,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-07 00:47:09,856 [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-07 00:47:10,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-07 00:47:10,754 [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-07 00:47:10,754 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-10-07 00:47:10,754 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:10,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-07 00:47:10,755 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:10,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:10,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:10,766 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:10,766 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:10,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:10,777 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:10,778 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-10-07 00:47:11,152 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-10-07 00:47:11,152 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-10-07 00:47:11,157 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:11,157 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:11,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:11,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-07 00:47:11,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:11,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-07 00:47:11,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:11,183 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-10-07 00:47:11,183 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-10-07 00:47:11,183 [ scc.git] DEBUG requirements.txt | 2 +-
2024-10-07 00:47:11,184 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-10-07 00:47:11,184 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-10-07 00:47:11,184 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-10-07 00:47:11,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:11,317 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:11,357 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:11,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:11,362 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:11,398 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:11,407 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea96fdb20> has no local changes
2024-10-07 00:47:11,407 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:11,429 [ scc.git] DEBUG [detached HEAD a03b489] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:11,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:11,430 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:11,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-10-07 00:47:12,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-10-07 00:47:12,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-10-07 00:47:13,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-07 00:47:13,722 [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-07 00:47:14,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-07 00:47:14,581 [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-07 00:47:14,581 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-10-07 00:47:15,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-10-07 00:47:15,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-10-07 00:47:16,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-07 00:47:16,548 [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-07 00:47:17,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-07 00:47:17,451 [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-07 00:47:17,452 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-07 00:47:17,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-10-07 00:47:18,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-10-07 00:47:18,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-07 00:47:19,296 [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-07 00:47:19,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-07 00:47:20,136 [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-07 00:47:20,136 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-07 00:47:20,137 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:20,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-07 00:47:20,137 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:20,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:20,144 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:20,150 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:20,150 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:20,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:20,162 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:20,162 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-10-07 00:47:21,123 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-07 00:47:21,123 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-10-07 00:47:21,129 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-10-07 00:47:21,644 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-07 00:47:21,644 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-10-07 00:47:21,650 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-10-07 00:47:21,947 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-07 00:47:21,947 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-10-07 00:47:21,952 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:21,952 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:21,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:21,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-07 00:47:21,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:21,970 [ 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-07 00:47:22,039 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-10-07 00:47:22,039 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-10-07 00:47:22,039 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-07 00:47:22,039 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-07 00:47:22,040 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:47:22,040 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:47:22,047 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-07 00:47:22,055 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-07 00:47:22,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:22,189 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-07 00:47:22,196 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-07 00:47:22,202 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-10-07 00:47:22,207 [ scc.config] DEBUG Found github.token
2024-10-07 00:47:22,207 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-10-07 00:47:22,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-07 00:47:22,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:22,219 [ 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-07 00:47:22,237 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-07 00:47:22,237 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-07 00:47:22,237 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-10-07 00:47:22,237 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:47:22,237 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:47:22,244 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-07 00:47:22,251 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-07 00:47:22,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:22,581 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-07 00:47:22,588 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-07 00:47:22,593 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/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-07 00:47:22,598 [ scc.config] DEBUG Found github.token
2024-10-07 00:47:22,598 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-10-07 00:47:22,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-07 00:47:22,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:22,610 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-07 00:47:22,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:22,654 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-10-07 00:47:22,654 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-10-07 00:47:22,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:22,956 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:22,997 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:22,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:23,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:23,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:23,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea96daf40> has no local changes
2024-10-07 00:47:23,052 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:23,060 [ scc.git] DEBUG [detached HEAD abaf170] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:23,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:23,061 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:23,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-10-07 00:47:23,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-10-07 00:47:23,982 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:47:24,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-07 00:47:24,998 [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-07 00:47:25,443 [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-07 00:47:26,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-07 00:47:26,408 [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-07 00:47:26,408 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-07 00:47:26,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-10-07 00:47:26,859 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:47:27,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-07 00:47:28,071 [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-07 00:47:28,566 [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-07 00:47:29,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-07 00:47:29,467 [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-07 00:47:29,468 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-07 00:47:29,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-10-07 00:47:29,910 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-07 00:47:30,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-07 00:47:30,937 [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-07 00:47:31,408 [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-07 00:47:31,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-07 00:47:32,253 [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-07 00:47:32,254 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-07 00:47:32,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-10-07 00:47:33,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-10-07 00:47:33,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-10-07 00:47:34,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-10-07 00:47:34,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-10-07 00:47:34,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-10-07 00:47:35,000 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:35,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-07 00:47:35,000 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:35,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:35,006 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:35,011 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:35,012 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:35,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:35,022 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:35,023 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-10-07 00:47:35,332 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-07 00:47:35,333 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-10-07 00:47:35,337 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-10-07 00:47:35,623 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-07 00:47:35,623 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-10-07 00:47:35,627 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-10-07 00:47:35,920 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-07 00:47:35,920 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-10-07 00:47:35,925 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:35,925 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:35,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:35,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-10-07 00:47:35,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:35,941 [ 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-07 00:47:35,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:35,953 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-10-07 00:47:35,953 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-10-07 00:47:36,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:36,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-10-07 00:47:36,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:36,097 [ 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-07 00:47:36,172 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-07 00:47:36,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:36,215 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-10-07 00:47:36,215 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-10-07 00:47:36,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:36,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-10-07 00:47:36,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:36,508 [ 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-07 00:47:36,535 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-07 00:47:36,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:36,540 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-10-07 00:47:36,541 [ scc.git] DEBUG package.json | 2 +-
2024-10-07 00:47:36,541 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-10-07 00:47:36,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:36,928 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:36,972 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:36,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:36,978 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:37,018 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:37,026 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea96fa400> has no local changes
2024-10-07 00:47:37,026 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:37,035 [ scc.git] DEBUG [detached HEAD d1f7044] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:37,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:37,036 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:37,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-10-07 00:47:37,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-10-07 00:47:38,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-07 00:47:38,805 [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-07 00:47:39,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-07 00:47:39,821 [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-07 00:47:39,822 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-10-07 00:47:39,822 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:39,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-07 00:47:39,822 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:39,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:39,828 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:39,834 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:39,834 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:39,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:39,847 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:39,848 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-07 00:47:40,175 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-10-07 00:47:40,175 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-07 00:47:40,179 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:40,180 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:40,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:40,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-07 00:47:40,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:40,195 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-07 00:47:40,204 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:40,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:40,342 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:40,386 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:40,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:40,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:40,431 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:40,437 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea86bfb20> has no local changes
2024-10-07 00:47:40,438 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:40,445 [ scc.git] DEBUG [detached HEAD 0806cd1] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:40,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:40,446 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:40,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-10-07 00:47:41,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-10-07 00:47:41,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-10-07 00:47:42,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-10-07 00:47:42,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-07 00:47:43,082 [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-07 00:47:43,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-07 00:47:43,988 [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-07 00:47:43,988 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-07 00:47:43,989 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:43,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-07 00:47:43,989 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:43,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:43,995 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:44,000 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:44,000 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:44,005 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:44,011 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:44,011 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-10-07 00:47:44,496 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-10-07 00:47:44,496 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-10-07 00:47:44,501 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:44,501 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:44,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:44,507 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-10-07 00:47:44,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:44,520 [ 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-07 00:47:44,530 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-10-07 00:47:44,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:44,533 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-10-07 00:47:44,533 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-10-07 00:47:44,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:44,665 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:44,707 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:44,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:44,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:44,754 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:44,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8695ee0> has no local changes
2024-10-07 00:47:44,760 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:44,769 [ scc.git] DEBUG [detached HEAD 3612376] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:44,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:44,769 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:45,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-10-07 00:47:45,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-10-07 00:47:46,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-10-07 00:47:46,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-07 00:47:47,120 [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-07 00:47:47,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-07 00:47:47,925 [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-07 00:47:47,925 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-07 00:47:47,925 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:47,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-07 00:47:47,926 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:47,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:47,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:47,937 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:47,937 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:47,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:47,947 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:47,947 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-07 00:47:48,334 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-10-07 00:47:48,334 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-07 00:47:48,338 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:48,339 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:48,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:48,345 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-07 00:47:48,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:48,356 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-07 00:47:48,468 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG Auto-merging setup.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-10-07 00:47:48,468 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:47:48,468 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:47:48,474 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-07 00:47:48,481 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-10-07 00:47:48,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:48,621 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-07 00:47:48,627 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-07 00:47:48,633 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-10-07 00:47:48,638 [ scc.config] DEBUG Found github.token
2024-10-07 00:47:48,639 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-10-07 00:47:48,639 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:48,681 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:48,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:48,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:48,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:48,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea86b3be0> has no local changes
2024-10-07 00:47:48,737 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:48,775 [ scc.git] DEBUG [detached HEAD 0c310f3] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:48,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:48,776 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:49,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-10-07 00:47:49,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-10-07 00:47:50,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-10-07 00:47:50,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-07 00:47:50,968 [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-07 00:47:51,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-07 00:47:51,786 [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-07 00:47:51,787 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-07 00:47:51,787 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:51,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-07 00:47:51,787 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:51,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:51,794 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:51,799 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:51,799 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:51,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:51,809 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:51,810 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-10-07 00:47:52,195 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-10-07 00:47:52,195 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-10-07 00:47:52,200 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:52,201 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:52,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-10-07 00:47:52,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,217 [ 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-07 00:47:52,236 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:47:52,242 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-10-07 00:47:52,243 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-10-07 00:47:52,243 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-10-07 00:47:52,243 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-10-07 00:47:52,243 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-10-07 00:47:52,245 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-10-07 00:47:52,246 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-10-07 00:47:52,246 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-10-07 00:47:52,246 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-10-07 00:47:52,246 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-10-07 00:47:52,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:52,374 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:52,415 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:52,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:52,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:52,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8679640> has no local changes
2024-10-07 00:47:52,468 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:52,528 [ scc.git] DEBUG [detached HEAD 9d36e21] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:52,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:52,528 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:52,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-10-07 00:47:52,774 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:52,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-07 00:47:52,775 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:52,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:52,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:52,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:52,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:52,796 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:52,796 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:52,796 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:52,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,801 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:52,837 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:52,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:52,842 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:52,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:52,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea867e8e0> has no local changes
2024-10-07 00:47:52,884 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:52,891 [ scc.git] DEBUG [detached HEAD a7153d6] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:52,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:52,892 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:53,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-10-07 00:47:53,178 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:53,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-07 00:47:53,178 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:53,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:53,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:53,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:53,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:53,195 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:53,200 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:53,200 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:53,200 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:53,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:53,205 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:53,242 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:53,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:53,248 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:53,284 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:53,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea86bfd60> has no local changes
2024-10-07 00:47:53,290 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:53,298 [ scc.git] DEBUG [detached HEAD 696e32a] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:53,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:53,298 [ scc.git] INFO Overriding base-branch from master to main
2024-10-07 00:47:53,298 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:53,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-10-07 00:47:54,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-10-07 00:47:54,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-10-07 00:47:55,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-10-07 00:47:55,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-07 00:47:55,971 [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-07 00:47:56,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-07 00:47:56,782 [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-07 00:47:56,782 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-07 00:47:56,783 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:56,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-07 00:47:56,783 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:56,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:56,789 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-10-07 00:47:56,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:56,795 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-10-07 00:47:56,800 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-10-07 00:47:56,805 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:56,805 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-10-07 00:47:57,191 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-10-07 00:47:57,191 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-10-07 00:47:57,196 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:57,196 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:57,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-07 00:47:57,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,213 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-07 00:47:57,246 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-10-07 00:47:57,246 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-10-07 00:47:57,246 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:47:57,247 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:47:57,253 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-07 00:47:57,262 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-10-07 00:47:57,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:47:57,395 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-07 00:47:57,401 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-07 00:47:57,406 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-10-07 00:47:57,412 [ scc.config] DEBUG Found github.token
2024-10-07 00:47:57,412 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-10-07 00:47:57,412 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:57,453 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:57,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,459 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:57,502 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:57,509 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8625910> has no local changes
2024-10-07 00:47:57,509 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:57,521 [ scc.git] DEBUG [detached HEAD af8ab07] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:57,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:57,524 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:57,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-10-07 00:47:57,793 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:57,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-07 00:47:57,793 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:57,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,799 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:57,804 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:57,804 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:57,810 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:57,816 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:57,816 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:57,816 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:57,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,821 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:57,861 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:57,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:57,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:57,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:57,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8685d60> has no local changes
2024-10-07 00:47:57,915 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:57,923 [ scc.git] DEBUG [detached HEAD a74c2df] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:57,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:57,924 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:58,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-10-07 00:47:58,218 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:47:58,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-07 00:47:58,218 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:58,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:58,225 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:47:58,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:47:58,232 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:47:58,238 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:47:58,245 [ scc.git] DEBUG Already up to date.
2024-10-07 00:47:58,245 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:47:58,245 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:58,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:58,250 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:47:58,290 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:47:58,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:47:58,296 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:47:58,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:47:58,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8643ee0> has no local changes
2024-10-07 00:47:58,342 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:47:58,350 [ scc.git] DEBUG [detached HEAD 615172c] merge master -Dorg -Ssuccess-only
2024-10-07 00:47:58,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:47:58,351 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:47:58,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-10-07 00:47:59,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-10-07 00:47:59,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-10-07 00:48:00,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-07 00:48:00,598 [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-07 00:48:01,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-07 00:48:01,413 [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-07 00:48:01,413 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-10-07 00:48:01,413 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:48:01,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-07 00:48:01,414 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:01,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:01,420 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-07 00:48:01,425 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:48:01,425 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-07 00:48:01,430 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-07 00:48:01,435 [ scc.git] DEBUG Already up to date.
2024-10-07 00:48:01,436 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-10-07 00:48:01,997 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-10-07 00:48:01,998 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-10-07 00:48:02,002 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:48:02,002 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:02,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:02,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-07 00:48:02,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:02,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-07 00:48:02,192 [ scc.git] DEBUG Auto-merging Dockerfile
2024-10-07 00:48:02,192 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-10-07 00:48:02,192 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:48:02,193 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:48:02,200 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-07 00:48:02,208 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-10-07 00:48:02,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:02,337 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-07 00:48:02,344 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-07 00:48:02,349 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-10-07 00:48:02,354 [ scc.config] DEBUG Found github.token
2024-10-07 00:48:02,354 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-10-07 00:48:02,355 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:48:02,397 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:02,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:02,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:48:02,441 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:48:02,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea8646be0> has no local changes
2024-10-07 00:48:02,449 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:48:02,457 [ scc.git] DEBUG [detached HEAD cc75dcc] merge master -Dorg -Ssuccess-only
2024-10-07 00:48:02,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:02,458 [ scc.git] INFO Overriding base-branch from master to develop
2024-10-07 00:48:02,458 [ scc.repo] DEBUG ## PRs found:
2024-10-07 00:48:02,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-10-07 00:48:03,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-10-07 00:48:03,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-07 00:48:04,230 [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-07 00:48:04,707 [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-07 00:48:05,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-07 00:48:05,597 [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-07 00:48:05,598 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-07 00:48:06,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-10-07 00:48:06,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-10-07 00:48:07,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-10-07 00:48:07,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-10-07 00:48:07,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-10-07 00:48:08,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-10-07 00:48:08,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-07 00:48:09,293 [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-07 00:48:09,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-07 00:48:10,131 [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-07 00:48:10,132 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-07 00:48:10,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-10-07 00:48:11,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-10-07 00:48:11,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-10-07 00:48:11,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-10-07 00:48:11,989 [ scc.repo] DEBUG ## Branches found:
2024-10-07 00:48:11,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-07 00:48:11,989 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:11,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:11,997 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-10-07 00:48:12,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-07 00:48:12,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-10-07 00:48:12,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-10-07 00:48:12,013 [ scc.git] DEBUG Already up to date.
2024-10-07 00:48:12,014 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-10-07 00:48:12,619 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-07 00:48:12,620 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-10-07 00:48:12,625 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-10-07 00:48:12,996 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-07 00:48:12,996 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-10-07 00:48:13,001 [ scc.git] DEBUG ## Unique users: []
2024-10-07 00:48:13,001 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:13,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:13,007 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-07 00:48:13,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:13,022 [ 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-07 00:48:13,141 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-10-07 00:48:13,141 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-10-07 00:48:13,141 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-07 00:48:13,141 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-07 00:48:13,148 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-07 00:48:13,156 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-07 00:48:13,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:13,284 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-07 00:48:13,292 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-07 00:48:13,300 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#204](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-10-07 00:48:13,306 [ scc.config] DEBUG Found github.token
2024-10-07 00:48:13,306 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-10-07 00:48:13,306 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-07 00:48:13,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:13,318 [ 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-07 00:48:13,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-07 00:48:13,348 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-10-07 00:48:13,348 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-10-07 00:48:13,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:13,669 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-07 00:48:13,712 [ scc.git] DEBUG Get sha1 of %s
2024-10-07 00:48:13,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-07 00:48:13,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:48:13,761 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:48:13,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ea86055b0> has no local changes
2024-10-07 00:48:13,768 [ 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:48:13,778 [ scc.git] DEBUG [detached HEAD ad6db95] merge master -Dorg -Ssuccess-only
2024-10-07 00:48:13,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:13,779 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-07 00:48:13,859 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-10-07 00:48:14,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:14,079 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-10-07 00:48:14,084 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-10-07 00:48:14,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:14,458 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-10-07 00:48:14,463 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-10-07 00:48:14,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:14,839 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-10-07 00:48:14,846 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-10-07 00:48:15,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:15,241 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-10-07 00:48:15,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:15,622 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-10-07 00:48:15,627 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-10-07 00:48:15,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:16,009 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-10-07 00:48:16,014 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-10-07 00:48:16,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:16,396 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-10-07 00:48:16,402 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-10-07 00:48:16,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:16,773 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-10-07 00:48:16,778 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-10-07 00:48:17,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:17,162 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-10-07 00:48:17,167 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-10-07 00:48:17,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:17,551 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-10-07 00:48:17,556 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-10-07 00:48:17,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:17,932 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-10-07 00:48:17,937 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-10-07 00:48:18,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:18,321 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-10-07 00:48:18,326 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-10-07 00:48:18,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:18,705 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-10-07 00:48:19,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:19,092 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-10-07 00:48:19,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:19,484 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-10-07 00:48:19,489 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-10-07 00:48:19,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:19,873 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-10-07 00:48:20,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:20,282 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-10-07 00:48:20,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:20,671 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-10-07 00:48:20,677 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-10-07 00:48:21,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:21,056 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-10-07 00:48:21,060 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-10-07 00:48:21,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:21,442 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-10-07 00:48:21,447 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-10-07 00:48:21,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:21,822 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-10-07 00:48:21,827 [ scc.config] DEBUG Found submodule.scripts.url
2024-10-07 00:48:22,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-07 00:48:22,207 [ scc.config] DEBUG Found submodule.scripts.branch
2024-10-07 00:48:22,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-07 00:48:22,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3eacd0a0a0> has local changes
2024-10-07 00:48:22,289 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 392 dependabot[bot] 'Bump omero-figure from `5f62399` to `33d8d26`'
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 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 33d8d26c..1c0e5f95
Previously merged:
- PR 555 will-moore 'Points in shape editor'
- PR 587 will-moore 'Update licenses.txt'
Merged PRs:
- PR 578 Rdornier 'Image outline'
- PR 584 Rdornier 'Link url to image'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 595 Rdornier 'Rotate image panel by 90°'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.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'
Repository: ome/omero-mapr
Excluded PRs:
- 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#204 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/204/)'
2024-10-07 00:48:22,361 [ scc.git] DEBUG [detached HEAD 9d462aa] merge master -Dorg -Ssuccess-only
2024-10-07 00:48:22,361 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-10-07 00:48:22,362 [ scc.merge] INFO Repository: ome/omero-plugins
2024-10-07 00:48:22,362 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 392 dependabot[bot] 'Bump omero-figure from `5f62399` to `33d8d26`'
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-10-07 00:48:22,362 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-10-07 00:48:22,362 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-10-07 00:48:22,362 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-10-07 00:48:22,362 [ scc.merge] INFO
2024-10-07 00:48:22,362 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-10-07 00:48:22,362 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-10-07 00:48:22,362 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-10-07 00:48:22,363 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-10-07 00:48:22,363 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-07 00:48:22,363 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Repository: ome/omero-figure
2024-10-07 00:48:22,363 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-10-07 00:48:22,363 [ scc.merge] INFO Updating 33d8d26c..1c0e5f95
2024-10-07 00:48:22,363 [ scc.merge] INFO Previously merged:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 587 will-moore 'Update licenses.txt'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,363 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-10-07 00:48:22,363 [ scc.merge] INFO
2024-10-07 00:48:22,363 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-10-07 00:48:22,363 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Repository: ome/omero-gallery
2024-10-07 00:48:22,364 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-10-07 00:48:22,364 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-10-07 00:48:22,364 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Repository: ome/omero-mapr
2024-10-07 00:48:22,364 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-10-07 00:48:22,364 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,364 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,364 [ scc.merge] INFO Repository: ome/omero-metadata
2024-10-07 00:48:22,364 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,364 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Repository: ome/omero-parade
2024-10-07 00:48:22,365 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-10-07 00:48:22,365 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-10-07 00:48:22,365 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Repository: ome/omero-rois
2024-10-07 00:48:22,365 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-07 00:48:22,365 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Repository: ome/omero-signup
2024-10-07 00:48:22,365 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,365 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,365 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-07 00:48:22,365 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,366 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: ome/omero-upload
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-10-07 00:48:22,366 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,366 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,366 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-10-07 00:48:22,366 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,366 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-10-07 00:48:22,366 [ scc.merge] INFO
2024-10-07 00:48:22,366 [ scc.merge] INFO Repository: ome/scripts
2024-10-07 00:48:22,366 [ scc.merge] INFO Excluded PRs:
2024-10-07 00:48:22,366 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-10-07 00:48:22,367 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-10-07 00:48:22,367 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-10-07 00:48:22,367 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-10-07 00:48:22,367 [ scc.merge] INFO Already up to date.
2024-10-07 00:48:22,367 [ scc.merge] INFO
2024-10-07 00:48:22,367 [ scc.merge] INFO Merged PRs:
2024-10-07 00:48:22,367 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-07 00:48:22,367 [ scc.merge] INFO
2024-10-07 00:48:22,367 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-07 00:48:22,367 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-07 00:48:22,367 [ scc.merge] INFO
2024-10-07 00:48:22,367 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-07 00:48:22,367 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-10-07 00:48:22,373 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-10-07 00:48:22,379 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-10-07 00:48:22,384 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-10-07 00:48:22,391 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-10-07 00:48:22,396 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-10-07 00:48:22,401 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-07 00:48:22,407 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-07 00:48:22,413 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-07 00:48:22,420 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-07 00:48:22,427 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-07 00:48:22,432 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-07 00:48:22,437 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-07 00:48:22,444 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-07 00:48:22,450 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-07 00:48:22,457 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-07 00:48:22,462 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-07 00:48:22,467 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-07 00:48:22,473 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-07 00:48:22,479 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-07 00:48:22,485 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-07 00:48:22,491 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-07 00:48:22,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-07 00:48:22,496 [ scc.git] DEBUG Calling 'git remote'
2024-10-07 00:48:22,502 [ 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 7a783d4] 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 33d8d26c
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 8d07dc0] 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-07 00:49:08,609 [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-07 00:49:17,134 [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-07 00:49:19,412 [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-07 00:49:23,881 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-10-07 00:50:03,376 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
