Console Output
Skipping 105 KB..
Full Logpbioimage
2024-10-12 00:50:57,392 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:50:57,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:50:57,399 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:50:57,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:50:57,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:50:57,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:50:57,414 [ scc.git] DEBUG Already up to date.
2024-10-12 00:50:57,414 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-10-12 00:50:57,777 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-10-12 00:50:57,777 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-10-12 00:50:57,782 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:50:57,782 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:50:57,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:50:57,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-10-12 00:50:57,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:50:57,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-10-12 00:50:57,855 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-10-12 00:50:57,855 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:50:57,858 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-10-12 00:50:57,858 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-10-12 00:50:58,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:50:58,028 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:50:58,065 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:50:58,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:50:58,070 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:50:58,104 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:50:58,110 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7034a700> has no local changes
2024-10-12 00:50:58,110 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:50:58,117 [ scc.git] DEBUG [detached HEAD 19b86b7] merge master -Dorg -Ssuccess-only
2024-10-12 00:50:58,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:50:58,118 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:50:58,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-10-12 00:50:58,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-10-12 00:50:58,936 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:50:59,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-10-12 00:50:59,969 [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-12 00:51:00,426 [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-12 00:51:01,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-10-12 00:51:01,424 [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-12 00:51:01,425 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-12 00:51:01,425 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:51:01,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-12 00:51:01,425 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:01,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:01,430 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:51:01,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:51:01,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:51:01,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:51:01,448 [ scc.git] DEBUG Already up to date.
2024-10-12 00:51:01,448 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-10-12 00:51:01,773 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-10-12 00:51:01,773 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-10-12 00:51:01,777 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:51:01,778 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:01,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:01,783 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-10-12 00:51:01,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:01,793 [ 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-12 00:51:01,803 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:01,806 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-10-12 00:51:01,806 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-10-12 00:51:01,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:01,943 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:51:01,980 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:01,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:01,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:51:02,023 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:51:02,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7031dcd0> has no local changes
2024-10-12 00:51:02,030 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:51:02,038 [ scc.git] DEBUG [detached HEAD 1c02aab] merge master -Dorg -Ssuccess-only
2024-10-12 00:51:02,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:51:02,038 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:51:02,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-10-12 00:51:02,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/486 HTTP/1.1" 200 None
2024-10-12 00:51:03,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/485 HTTP/1.1" 200 None
2024-10-12 00:51:03,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484 HTTP/1.1" 200 None
2024-10-12 00:51:04,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/484/comments HTTP/1.1" 200 None
2024-10-12 00:51:04,370 [ scc.repo] DEBUG # ... Include label: include
2024-10-12 00:51:05,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05 HTTP/1.1" 200 None
2024-10-12 00:51:05,667 [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-12 00:51:06,112 [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-12 00:51:06,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/68b90aebf749c074bde218ba36d3ce662068cd05 HTTP/1.1" 200 None
2024-10-12 00:51:06,947 [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-12 00:51:06,948 [ scc.repo] DEBUG - PR 484 barrettMCW 'improved mirroring'
2024-10-12 00:51:07,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-10-12 00:51:07,434 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:51:07,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-12 00:51:08,421 [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-12 00:51:08,940 [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-12 00:51:09,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-10-12 00:51:09,966 [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-12 00:51:09,967 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-12 00:51:10,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-10-12 00:51:10,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-10-12 00:51:11,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-12 00:51:11,830 [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-12 00:51:12,250 [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-12 00:51:12,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-10-12 00:51:13,076 [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-12 00:51:13,076 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-12 00:51:13,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-10-12 00:51:13,520 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:51:14,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-12 00:51:14,616 [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-12 00:51:15,104 [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-12 00:51:15,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-10-12 00:51:16,204 [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-12 00:51:16,205 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-12 00:51:16,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-10-12 00:51:16,661 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:51:17,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-12 00:51:17,668 [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-12 00:51:18,156 [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-12 00:51:18,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-10-12 00:51:19,190 [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-12 00:51:19,191 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-12 00:51:19,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-10-12 00:51:20,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-10-12 00:51:20,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-12 00:51:21,133 [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-12 00:51:21,559 [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-12 00:51:22,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-10-12 00:51:22,448 [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-12 00:51:22,449 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-12 00:51:22,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-10-12 00:51:23,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-10-12 00:51:23,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-12 00:51:24,446 [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-12 00:51:24,895 [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-12 00:51:25,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-10-12 00:51:25,794 [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-12 00:51:25,794 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-10-12 00:51:26,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-10-12 00:51:26,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-10-12 00:51:27,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-12 00:51:27,694 [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-12 00:51:28,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-10-12 00:51:28,524 [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-12 00:51:28,525 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-10-12 00:51:28,525 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:51:28,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-12 00:51:28,525 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:28,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:28,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:51:28,537 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:51:28,537 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:51:28,669 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:51:28,675 [ scc.git] DEBUG Already up to date.
2024-10-12 00:51:28,675 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-10-12 00:51:29,010 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:29,011 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-10-12 00:51:29,015 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-10-12 00:51:29,867 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:29,867 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-10-12 00:51:29,872 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-10-12 00:51:30,214 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:30,215 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-10-12 00:51:30,219 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-10-12 00:51:30,524 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:30,524 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-10-12 00:51:30,528 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-10-12 00:51:30,825 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:30,825 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-10-12 00:51:30,829 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-10-12 00:51:31,219 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:31,220 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-10-12 00:51:31,224 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-10-12 00:51:31,540 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:31,540 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-10-12 00:51:31,544 [ scc.git] DEBUG Calling 'git fetch origin pull/484/head'
2024-10-12 00:51:32,664 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-10-12 00:51:32,664 [ scc.git] DEBUG * branch refs/pull/484/head -> FETCH_HEAD
2024-10-12 00:51:32,669 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:51:32,669 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:32,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:32,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-12 00:51:32,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:32,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-10-12 00:51:32,817 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-12 00:51:32,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:32,822 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-10-12 00:51:32,822 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-10-12 00:51:32,822 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-10-12 00:51:32,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:32,963 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-12 00:51:32,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:32,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-10-12 00:51:32,996 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-10-12 00:51:32,996 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-12 00:51:32,996 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-12 00:51:32,996 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-10-12 00:51:32,996 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:33,000 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-10-12 00:51:33,001 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-10-12 00:51:33,001 [ scc.git] DEBUG src/app/header.html | 5 +
2024-10-12 00:51:33,001 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-10-12 00:51:33,001 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-10-12 00:51:33,001 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-10-12 00:51:33,001 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-10-12 00:51:33,001 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-10-12 00:51:33,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:33,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-12 00:51:33,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:33,369 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-10-12 00:51:33,381 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-10-12 00:51:33,382 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:33,385 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-10-12 00:51:33,385 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-10-12 00:51:33,385 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-10-12 00:51:33,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:33,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-12 00:51:33,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:33,767 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-10-12 00:51:33,782 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:33,791 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-10-12 00:51:33,791 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-10-12 00:51:34,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:34,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-10-12 00:51:34,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:34,164 [ 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-12 00:51:34,194 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-12 00:51:34,195 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:34,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:34,547 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-10-12 00:51:34,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:34,559 [ 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-12 00:51:34,574 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-10-12 00:51:34,574 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-10-12 00:51:34,574 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-10-12 00:51:34,575 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-10-12 00:51:34,579 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-10-12 00:51:34,579 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-10-12 00:51:34,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:34,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-10-12 00:51:34,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:34,954 [ 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-12 00:51:34,987 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-12 00:51:34,988 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:34,997 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-10-12 00:51:34,997 [ scc.git] DEBUG package.json | 2 +-
2024-10-12 00:51:34,997 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-10-12 00:51:35,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:35,324 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...68b90aebf749c074bde218ba36d3ce662068cd05'
2024-10-12 00:51:35,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:35,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 484 (improved mirroring) 68b90aebf749c074bde218ba36d3ce662068cd05'
2024-10-12 00:51:35,400 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:35,403 [ scc.git] DEBUG src/viewers/viewer/controls/Mirror.js | 235 ++++++++++++++++------------------
2024-10-12 00:51:35,403 [ scc.git] DEBUG 1 file changed, 111 insertions(+), 124 deletions(-)
2024-10-12 00:51:35,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:35,704 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:51:35,745 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:35,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:35,750 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:51:35,788 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:51:35,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7034d430> has no local changes
2024-10-12 00:51:35,795 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
- PR 484 barrettMCW 'improved mirroring'
Generated by OMERO-plugins-push#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:51:35,804 [ scc.git] DEBUG [detached HEAD 4b023e3] merge master -Dorg -Ssuccess-only
2024-10-12 00:51:35,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:51:35,804 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:51:36,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-10-12 00:51:36,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86 HTTP/1.1" 200 None
2024-10-12 00:51:37,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/86/comments HTTP/1.1" 200 None
2024-10-12 00:51:37,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/c698c730a10c08fde992fdc12bc1c2fab329957b HTTP/1.1" 200 None
2024-10-12 00:51:38,146 [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-12 00:51:38,594 [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-12 00:51:39,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-10-12 00:51:39,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-10-12 00:51:40,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-12 00:51:40,495 [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-12 00:51:40,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-10-12 00:51:41,296 [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-12 00:51:41,296 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-10-12 00:51:41,297 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:51:41,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-12 00:51:41,297 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:41,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:41,303 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:51:41,308 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:51:41,308 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:51:41,313 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:51:41,318 [ scc.git] DEBUG Already up to date.
2024-10-12 00:51:41,319 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-10-12 00:51:41,637 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-10-12 00:51:41,637 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-10-12 00:51:41,642 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:51:41,642 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:41,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:41,648 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-12 00:51:41,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:41,658 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-10-12 00:51:41,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:41,670 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-10-12 00:51:41,670 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-10-12 00:51:41,670 [ scc.git] DEBUG requirements.txt | 2 +-
2024-10-12 00:51:41,670 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-10-12 00:51:41,670 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-10-12 00:51:41,670 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-10-12 00:51:41,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:41,799 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:51:41,836 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:41,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:41,840 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:51:41,874 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:51:41,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702f8370> has no local changes
2024-10-12 00:51:41,880 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:51:41,888 [ scc.git] DEBUG [detached HEAD fe05858] merge master -Dorg -Ssuccess-only
2024-10-12 00:51:41,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:51:41,888 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:51:42,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-10-12 00:51:42,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-10-12 00:51:43,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-10-12 00:51:43,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-12 00:51:44,390 [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-12 00:51:44,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-10-12 00:51:45,199 [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-12 00:51:45,200 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-10-12 00:51:45,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-10-12 00:51:46,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-10-12 00:51:46,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-12 00:51:47,071 [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-12 00:51:47,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-10-12 00:51:47,882 [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-12 00:51:47,883 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-12 00:51:48,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-10-12 00:51:48,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-10-12 00:51:49,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-12 00:51:49,809 [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-12 00:51:50,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-10-12 00:51:50,717 [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-12 00:51:50,718 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-12 00:51:50,718 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:51:50,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-12 00:51:50,718 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:50,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:50,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:51:50,729 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:51:50,729 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:51:50,735 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:51:50,740 [ scc.git] DEBUG Already up to date.
2024-10-12 00:51:50,740 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-10-12 00:51:51,062 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-12 00:51:51,063 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-10-12 00:51:51,067 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-10-12 00:51:51,391 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-12 00:51:51,391 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-10-12 00:51:51,396 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-10-12 00:51:51,707 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-10-12 00:51:51,707 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-10-12 00:51:51,712 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:51:51,712 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:51,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:51,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-12 00:51:51,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:51,728 [ 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-12 00:51:51,741 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-10-12 00:51:51,741 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-10-12 00:51:51,741 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-12 00:51:51,741 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-12 00:51:51,741 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:51:51,742 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:51:51,746 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-12 00:51:51,752 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-12 00:51:51,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:51,897 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-10-12 00:51:51,904 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-12 00:51:51,909 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-10-12 00:51:51,913 [ scc.config] DEBUG Found github.token
2024-10-12 00:51:51,913 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-10-12 00:51:51,914 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-12 00:51:51,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:51,924 [ 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-12 00:51:51,940 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-10-12 00:51:51,940 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-10-12 00:51:51,940 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-10-12 00:51:51,940 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:51:51,940 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:51:51,946 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-12 00:51:51,953 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-10-12 00:51:52,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:52,285 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-10-12 00:51:52,292 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-10-12 00:51:52,297 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/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-12 00:51:52,301 [ scc.config] DEBUG Found github.token
2024-10-12 00:51:52,301 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-10-12 00:51:52,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-12 00:51:52,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:52,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-10-12 00:51:52,320 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:51:52,323 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-10-12 00:51:52,323 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-10-12 00:51:52,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:51:52,678 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:51:52,718 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:51:52,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:51:52,724 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:51:52,762 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:51:52,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702f7ee0> has no local changes
2024-10-12 00:51:52,769 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:51:52,777 [ scc.git] DEBUG [detached HEAD 6b5af0e] merge master -Dorg -Ssuccess-only
2024-10-12 00:51:52,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:51:52,778 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:51:53,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-10-12 00:51:53,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-10-12 00:51:53,719 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:51:54,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-12 00:51:54,783 [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-12 00:51:55,255 [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-12 00:51:55,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-10-12 00:51:56,225 [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-12 00:51:56,226 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-12 00:51:56,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-10-12 00:51:56,656 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:51:57,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-12 00:51:57,793 [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-12 00:51:58,261 [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-12 00:51:58,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-10-12 00:51:59,165 [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-12 00:51:59,166 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-12 00:51:59,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-10-12 00:51:59,592 [ scc.repo] DEBUG # ... Include label: dependencies
2024-10-12 00:52:00,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-12 00:52:00,655 [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-12 00:52:01,095 [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-12 00:52:01,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-10-12 00:52:02,063 [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-12 00:52:02,063 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-12 00:52:02,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-10-12 00:52:02,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-10-12 00:52:03,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-10-12 00:52:03,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-10-12 00:52:04,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-10-12 00:52:04,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-10-12 00:52:04,919 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:04,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-12 00:52:04,919 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:04,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:04,924 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:04,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:04,929 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:04,936 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:04,942 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:04,942 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-10-12 00:52:05,327 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-12 00:52:05,328 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-10-12 00:52:05,332 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-10-12 00:52:05,682 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-12 00:52:05,682 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-10-12 00:52:05,687 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-10-12 00:52:06,137 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-10-12 00:52:06,137 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-10-12 00:52:06,142 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:06,142 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:06,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:06,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-10-12 00:52:06,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:06,157 [ 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-12 00:52:06,166 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:06,168 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-10-12 00:52:06,169 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-10-12 00:52:06,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:06,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-10-12 00:52:06,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:06,314 [ 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-12 00:52:06,352 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-12 00:52:06,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:06,355 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-10-12 00:52:06,355 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-10-12 00:52:06,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:06,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-10-12 00:52:06,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:06,701 [ 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-12 00:52:06,712 [ scc.git] DEBUG Auto-merging package-lock.json
2024-10-12 00:52:06,713 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:06,716 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-10-12 00:52:06,716 [ scc.git] DEBUG package.json | 2 +-
2024-10-12 00:52:06,716 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-10-12 00:52:07,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:07,120 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:07,158 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:07,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:07,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:07,198 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:07,204 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702e2be0> has no local changes
2024-10-12 00:52:07,205 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:07,212 [ scc.git] DEBUG [detached HEAD a33a6e5] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:07,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:07,212 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:07,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-10-12 00:52:08,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-10-12 00:52:08,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-12 00:52:09,140 [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-12 00:52:09,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-10-12 00:52:10,073 [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-12 00:52:10,074 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-10-12 00:52:10,074 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:10,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-12 00:52:10,074 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:10,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:10,080 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:10,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:10,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:10,090 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:10,095 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:10,095 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-12 00:52:10,418 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-10-12 00:52:10,418 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-12 00:52:10,422 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:10,422 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:10,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:10,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-12 00:52:10,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:10,437 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-10-12 00:52:10,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:10,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:10,588 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:10,624 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:10,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:10,629 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:10,666 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:10,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702c7fa0> has no local changes
2024-10-12 00:52:10,673 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:10,681 [ scc.git] DEBUG [detached HEAD 1a96f8e] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:10,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:10,681 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:11,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-10-12 00:52:11,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-10-12 00:52:12,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-10-12 00:52:12,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-10-12 00:52:13,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-12 00:52:13,474 [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-12 00:52:14,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-10-12 00:52:14,469 [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-12 00:52:14,470 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-12 00:52:14,470 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:14,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-12 00:52:14,470 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:14,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:14,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:14,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:14,480 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:14,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:14,491 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:14,492 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-10-12 00:52:14,830 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-10-12 00:52:14,831 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-10-12 00:52:14,835 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:14,835 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:14,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:14,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-10-12 00:52:14,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:14,850 [ 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-12 00:52:14,858 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-10-12 00:52:14,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:14,861 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-10-12 00:52:14,861 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-10-12 00:52:15,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:15,038 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:15,075 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:15,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:15,080 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:15,116 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:15,123 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702b1c70> has no local changes
2024-10-12 00:52:15,123 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:15,131 [ scc.git] DEBUG [detached HEAD 71d48e3] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:15,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:15,132 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:15,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-10-12 00:52:15,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-10-12 00:52:16,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-10-12 00:52:16,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-12 00:52:17,456 [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-12 00:52:18,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-10-12 00:52:18,432 [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-12 00:52:18,433 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-12 00:52:18,433 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:18,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-12 00:52:18,433 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:18,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:18,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:18,444 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:18,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:18,449 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:18,454 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:18,454 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-10-12 00:52:18,787 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-10-12 00:52:18,788 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-10-12 00:52:18,792 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:18,792 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:18,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:18,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-12 00:52:18,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:18,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-12 00:52:18,816 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG Auto-merging setup.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-10-12 00:52:18,817 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:52:18,817 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:52:18,822 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-12 00:52:18,828 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-10-12 00:52:18,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:18,975 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-10-12 00:52:18,980 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-10-12 00:52:18,985 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-10-12 00:52:18,989 [ scc.config] DEBUG Found github.token
2024-10-12 00:52:18,989 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-10-12 00:52:18,989 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:19,026 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:19,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:19,031 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:19,066 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:19,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702bca90> has no local changes
2024-10-12 00:52:19,072 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:19,079 [ scc.git] DEBUG [detached HEAD 649936b] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:19,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:19,080 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:19,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-10-12 00:52:19,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-10-12 00:52:20,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-10-12 00:52:20,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-12 00:52:21,289 [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-12 00:52:21,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-10-12 00:52:22,128 [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-12 00:52:22,128 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-12 00:52:22,128 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:22,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-12 00:52:22,128 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:22,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:22,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:22,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:22,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:22,145 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:22,150 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:22,150 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-10-12 00:52:22,514 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-10-12 00:52:22,514 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-10-12 00:52:22,518 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:22,518 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:22,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:22,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-10-12 00:52:22,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:22,537 [ 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-12 00:52:22,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:22,552 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-10-12 00:52:22,553 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-10-12 00:52:22,555 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-10-12 00:52:22,555 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-10-12 00:52:22,555 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-10-12 00:52:22,555 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-10-12 00:52:22,555 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-10-12 00:52:22,555 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-10-12 00:52:22,555 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-10-12 00:52:22,556 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-10-12 00:52:22,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:22,682 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:22,723 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:22,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:22,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:22,768 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:22,775 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702c75b0> has no local changes
2024-10-12 00:52:22,775 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:22,783 [ scc.git] DEBUG [detached HEAD 3f53ede] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:22,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:22,784 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:23,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-10-12 00:52:23,086 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:23,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-12 00:52:23,086 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,091 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:23,096 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:23,096 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:23,101 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:23,106 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:23,106 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:23,106 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,111 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:23,146 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,153 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:23,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:23,198 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb702812e0> has no local changes
2024-10-12 00:52:23,199 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:23,207 [ scc.git] DEBUG [detached HEAD cb15630] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:23,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:23,207 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:23,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-10-12 00:52:23,502 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:23,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-12 00:52:23,502 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,507 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:23,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:23,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:23,517 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:23,522 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:23,522 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:23,522 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,526 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:23,561 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:23,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:23,565 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:23,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:23,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7022b5b0> has no local changes
2024-10-12 00:52:23,607 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:23,615 [ scc.git] DEBUG [detached HEAD 2440105] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:23,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:23,616 [ scc.git] INFO Overriding base-branch from master to main
2024-10-12 00:52:23,616 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:23,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-10-12 00:52:24,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-10-12 00:52:24,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-10-12 00:52:25,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-10-12 00:52:25,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-12 00:52:26,259 [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-12 00:52:26,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-10-12 00:52:27,248 [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-12 00:52:27,249 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-12 00:52:27,249 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:27,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-12 00:52:27,249 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:27,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:27,255 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-10-12 00:52:27,260 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:27,261 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-10-12 00:52:27,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-10-12 00:52:27,276 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:27,277 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-10-12 00:52:27,590 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-10-12 00:52:27,590 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-10-12 00:52:27,595 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:27,595 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:27,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:27,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-12 00:52:27,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:27,611 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-12 00:52:27,770 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-10-12 00:52:27,771 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-10-12 00:52:27,771 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:52:27,771 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:52:27,777 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-12 00:52:27,784 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-10-12 00:52:27,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:27,916 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-10-12 00:52:27,923 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-10-12 00:52:27,928 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-10-12 00:52:27,932 [ scc.config] DEBUG Found github.token
2024-10-12 00:52:27,932 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-10-12 00:52:27,933 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:27,969 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:27,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:27,973 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:28,009 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:28,014 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7025eeb0> has no local changes
2024-10-12 00:52:28,015 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:28,024 [ scc.git] DEBUG [detached HEAD cf8a0b5] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:28,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:28,024 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:28,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-10-12 00:52:28,314 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:28,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-12 00:52:28,314 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,320 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:28,324 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:28,324 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:28,329 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:28,334 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:28,334 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:28,334 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,339 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:28,374 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,380 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:28,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:28,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7022b7f0> has no local changes
2024-10-12 00:52:28,425 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:28,432 [ scc.git] DEBUG [detached HEAD d419644] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:28,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:28,432 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:28,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-10-12 00:52:28,721 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:28,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-12 00:52:28,722 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,727 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:28,732 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:28,732 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:28,737 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:28,742 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:28,742 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:28,742 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:28,784 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:28,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:28,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:28,826 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:28,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7024ac10> has no local changes
2024-10-12 00:52:28,832 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:28,840 [ scc.git] DEBUG [detached HEAD f0cf8b4] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:28,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:28,840 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:29,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-10-12 00:52:29,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-10-12 00:52:30,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-10-12 00:52:30,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-12 00:52:31,049 [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-12 00:52:31,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-10-12 00:52:31,976 [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-12 00:52:31,976 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-10-12 00:52:31,977 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:31,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-12 00:52:31,977 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:31,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:31,983 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-10-12 00:52:31,988 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:31,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-10-12 00:52:31,993 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-10-12 00:52:31,998 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:31,998 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-10-12 00:52:32,331 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-10-12 00:52:32,331 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-10-12 00:52:32,335 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:32,335 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:32,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:32,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-12 00:52:32,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:32,350 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-12 00:52:32,671 [ scc.git] DEBUG Auto-merging Dockerfile
2024-10-12 00:52:32,671 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-10-12 00:52:32,671 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:52:32,671 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:52:32,677 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-12 00:52:32,684 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-10-12 00:52:32,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:32,821 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-10-12 00:52:32,826 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-10-12 00:52:32,832 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-10-12 00:52:32,836 [ scc.config] DEBUG Found github.token
2024-10-12 00:52:32,836 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-10-12 00:52:32,836 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:32,873 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:32,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:32,877 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:32,913 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:32,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb70245fd0> has no local changes
2024-10-12 00:52:32,919 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:32,928 [ scc.git] DEBUG [detached HEAD f7f6c2a] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:32,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:32,928 [ scc.git] INFO Overriding base-branch from master to develop
2024-10-12 00:52:32,928 [ scc.repo] DEBUG ## PRs found:
2024-10-12 00:52:33,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-10-12 00:52:33,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-10-12 00:52:34,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-12 00:52:34,783 [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-12 00:52:35,222 [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-12 00:52:35,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-10-12 00:52:36,086 [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-12 00:52:36,087 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-12 00:52:36,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-10-12 00:52:37,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-10-12 00:52:37,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-10-12 00:52:37,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-10-12 00:52:38,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-10-12 00:52:38,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-10-12 00:52:39,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-12 00:52:39,634 [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-12 00:52:40,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-10-12 00:52:40,461 [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-12 00:52:40,462 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-12 00:52:40,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-10-12 00:52:41,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-10-12 00:52:41,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-10-12 00:52:42,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-10-12 00:52:42,346 [ scc.repo] DEBUG ## Branches found:
2024-10-12 00:52:42,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-12 00:52:42,346 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:42,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:42,352 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-10-12 00:52:42,358 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-10-12 00:52:42,358 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-10-12 00:52:42,364 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-10-12 00:52:42,369 [ scc.git] DEBUG Already up to date.
2024-10-12 00:52:42,370 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-10-12 00:52:42,724 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-12 00:52:42,724 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-10-12 00:52:42,730 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-10-12 00:52:43,071 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-10-12 00:52:43,072 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-10-12 00:52:43,076 [ scc.git] DEBUG ## Unique users: []
2024-10-12 00:52:43,076 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:43,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:43,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-12 00:52:43,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:43,095 [ 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-12 00:52:43,105 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-10-12 00:52:43,105 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-10-12 00:52:43,105 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-10-12 00:52:43,105 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-10-12 00:52:43,110 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-12 00:52:43,116 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-10-12 00:52:43,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:43,248 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-10-12 00:52:43,255 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-10-12 00:52:43,260 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#209](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-10-12 00:52:43,265 [ scc.config] DEBUG Found github.token
2024-10-12 00:52:43,265 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-10-12 00:52:43,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-10-12 00:52:43,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:43,275 [ 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-12 00:52:43,340 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-10-12 00:52:43,343 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-10-12 00:52:43,343 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-10-12 00:52:43,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:43,634 [ scc.git] DEBUG Calling 'git submodule update'
2024-10-12 00:52:43,674 [ scc.git] DEBUG Get sha1 of %s
2024-10-12 00:52:43,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-10-12 00:52:43,680 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:43,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:43,724 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb7020b520> has no local changes
2024-10-12 00:52:43,724 [ 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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:43,732 [ scc.git] DEBUG [detached HEAD a0ebc40] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:43,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:43,733 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-10-12 00:52:43,803 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-10-12 00:52:44,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:44,028 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-10-12 00:52:44,034 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-10-12 00:52:44,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:44,400 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-10-12 00:52:44,405 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-10-12 00:52:44,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:44,784 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-10-12 00:52:44,789 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-10-12 00:52:45,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:45,171 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-10-12 00:52:45,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:45,550 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-10-12 00:52:45,554 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-10-12 00:52:45,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:45,992 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-10-12 00:52:45,998 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-10-12 00:52:46,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:46,369 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-10-12 00:52:46,373 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-10-12 00:52:46,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:46,749 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-10-12 00:52:46,753 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-10-12 00:52:47,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:47,124 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-10-12 00:52:47,129 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-10-12 00:52:47,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:47,518 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-10-12 00:52:47,523 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-10-12 00:52:47,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:47,896 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-10-12 00:52:47,901 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-10-12 00:52:48,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:48,280 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-10-12 00:52:48,286 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-10-12 00:52:48,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:48,660 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-10-12 00:52:49,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:49,042 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-10-12 00:52:49,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:49,423 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-10-12 00:52:49,428 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-10-12 00:52:49,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:49,818 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-10-12 00:52:50,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:50,200 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-10-12 00:52:50,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:50,575 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-10-12 00:52:50,580 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-10-12 00:52:50,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:50,950 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-10-12 00:52:50,955 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-10-12 00:52:51,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:51,332 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-10-12 00:52:51,337 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-10-12 00:52:51,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:51,716 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-10-12 00:52:51,721 [ scc.config] DEBUG Found submodule.scripts.url
2024-10-12 00:52:52,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-10-12 00:52:52,090 [ scc.config] DEBUG Found submodule.scripts.branch
2024-10-12 00:52:52,090 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-10-12 00:52:52,164 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feb711028b0> has local changes
2024-10-12 00:52:52,164 [ 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 393 dependabot[bot] 'Bump omero-figure from `5f62399` to `1c0e5f9`'
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 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
- PR 584 Rdornier 'Link url to image'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 595 Rdornier 'Rotate image panel by 90°'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
- PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
- PR 484 barrettMCW 'improved mirroring'
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#209 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/209/)'
2024-10-12 00:52:52,177 [ scc.git] DEBUG [detached HEAD 1b59799] merge master -Dorg -Ssuccess-only
2024-10-12 00:52:52,177 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-10-12 00:52:52,177 [ scc.merge] INFO Repository: ome/omero-plugins
2024-10-12 00:52:52,177 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,177 [ scc.merge] INFO
2024-10-12 00:52:52,177 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,177 [ scc.merge] INFO - PR 393 dependabot[bot] 'Bump omero-figure from `5f62399` to `1c0e5f9`'
2024-10-12 00:52:52,177 [ scc.merge] INFO
2024-10-12 00:52:52,177 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-10-12 00:52:52,177 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,177 [ scc.merge] INFO
2024-10-12 00:52:52,177 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,177 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-10-12 00:52:52,177 [ scc.merge] INFO
2024-10-12 00:52:52,177 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-10-12 00:52:52,177 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,177 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-10-12 00:52:52,177 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,177 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-10-12 00:52:52,178 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-10-12 00:52:52,178 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-10-12 00:52:52,178 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-12 00:52:52,178 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Repository: ome/omero-figure
2024-10-12 00:52:52,178 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure' (user: Tom-TBT)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality' (user: MinaEnayat)
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-10-12 00:52:52,178 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,178 [ scc.merge] INFO
2024-10-12 00:52:52,178 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,178 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-10-12 00:52:52,179 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Repository: ome/omero-gallery
2024-10-12 00:52:52,179 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-10-12 00:52:52,179 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 486 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled' (user: Tom-TBT)
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 485 Tom-TBT 'Dynamic LUT for iviewer' (user: Tom-TBT)
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-10-12 00:52:52,179 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-10-12 00:52:52,179 [ scc.merge] INFO - PR 484 barrettMCW 'improved mirroring'
2024-10-12 00:52:52,179 [ scc.merge] INFO
2024-10-12 00:52:52,179 [ scc.merge] INFO Repository: ome/omero-mapr
2024-10-12 00:52:52,179 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 86 will-moore 'fix return of default favicon if not found' (status: failure)
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-10-12 00:52:52,180 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Repository: ome/omero-metadata
2024-10-12 00:52:52,180 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Repository: ome/omero-parade
2024-10-12 00:52:52,180 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-10-12 00:52:52,180 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-10-12 00:52:52,180 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,180 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-10-12 00:52:52,180 [ scc.merge] INFO
2024-10-12 00:52:52,180 [ scc.merge] INFO Repository: ome/omero-rois
2024-10-12 00:52:52,180 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: ome/omero-signup
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: ome/omero-upload
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-10-12 00:52:52,181 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,181 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-10-12 00:52:52,181 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,181 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-10-12 00:52:52,182 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-10-12 00:52:52,182 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Repository: ome/scripts
2024-10-12 00:52:52,182 [ scc.merge] INFO Excluded PRs:
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-10-12 00:52:52,182 [ scc.merge] INFO Already up to date.
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Merged PRs:
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] INFO Conflicting PRs (not included):
2024-10-12 00:52:52,182 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-10-12 00:52:52,182 [ scc.merge] INFO
2024-10-12 00:52:52,182 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-10-12 00:52:52,182 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-10-12 00:52:52,187 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-10-12 00:52:52,191 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-10-12 00:52:52,196 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-10-12 00:52:52,200 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-10-12 00:52:52,205 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-10-12 00:52:52,210 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-10-12 00:52:52,214 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-10-12 00:52:52,219 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-10-12 00:52:52,224 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-10-12 00:52:52,228 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-10-12 00:52:52,233 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-10-12 00:52:52,237 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-10-12 00:52:52,243 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-10-12 00:52:52,248 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-10-12 00:52:52,253 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-10-12 00:52:52,258 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-10-12 00:52:52,262 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-10-12 00:52:52,267 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-10-12 00:52:52,271 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-10-12 00:52:52,276 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-10-12 00:52:52,281 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-10-12 00:52:52,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-10-12 00:52:52,285 [ scc.git] DEBUG Calling 'git remote'
2024-10-12 00:52:52,289 [ 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 23acf3d] 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 1c0e5f95
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 1510878] 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-12 00:53:36,484 [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-12 00:53:45,080 [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-12 00:53:47,442 [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-12 00:53:51,837 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-10-12 00:54:36,560 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
